From 8738b8e0f7cfa65732bfc0e40fa80e1ca3c7e27e Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期六, 19 十月 2024 08:07:01 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
index 82f96cd..8cb3614 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
@@ -53,10 +53,6 @@
@Resource
WorkAssignmentMapper workAssignmentMapper;
- @Override
- public List<Damage> selectDamage(String startTime, String endTime, int type, String workingProcedure) {
- return null;
- }
/**
* 鏌ヨ鎶ュ伐淇℃伅
@@ -174,14 +170,22 @@
*/
@Override
public void insertDamage(Damage damage) {
- List<Damage> damage1 = baseMapper.selectList(
- new LambdaQueryWrapper<Damage>()
- .ne(Damage::getType, Const.GLASS_STATE_DAMAGE)
- .ne(Damage::getType, Const.GLASS_STATE_TAKE)
- .eq(Damage::getLine, damage.getLine())
- .eq(Damage::getWorkingProcedure, damage.getWorkingProcedure())
- .eq(Damage::getGlassId, damage.getGlassId())
- );
+ List<Damage> damage1 = null;
+ if (Const.GLASS_STATE_DAMAGE.equals(damage.getType()) || Const.GLASS_STATE_TAKE.equals(damage.getType())) {
+ damage1 = baseMapper.selectList(
+ new LambdaQueryWrapper<Damage>()
+ .in(Damage::getType, Const.GLASS_STATE_DAMAGE, Const.GLASS_STATE_TAKE)
+ .eq(Damage::getGlassId, damage.getGlassId())
+ );
+ } else {
+ damage1 = baseMapper.selectList(
+ new LambdaQueryWrapper<Damage>()
+ .notIn(Damage::getType, Const.GLASS_STATE_DAMAGE, Const.GLASS_STATE_TAKE)
+ .eq(Damage::getLine, damage.getLine())
+ .eq(Damage::getWorkingProcedure, damage.getWorkingProcedure())
+ .eq(Damage::getGlassId, damage.getGlassId())
+ );
+ }
if (damage1 == null || damage1.size() == 0) {
LambdaQueryWrapper<GlassInfo> glassInfoSelectWrapper = new LambdaQueryWrapper<>();
glassInfoSelectWrapper.eq(GlassInfo::getGlassId, damage.getGlassId());
@@ -206,7 +210,7 @@
}
if (damage.getType() == 1) {
if (submitReport(damage)) {
- damage.setStatus(2);
+ damage.setStatus(3);
} else {
damage.setStatus(1);
}
--
Gitblit v1.8.0