From 2837bdd57f72e386bbf9a725e7b3a13e5eb9e930 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 21 八月 2023 09:19:57 +0800
Subject: [PATCH] 修复bug
---
server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java
index 73db15a..f094941 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java
@@ -407,8 +407,8 @@
tModle.setUrgent(w.getUrgent());
tModle.setUpdateTime(w.getUpdateTime());
tModle.setRemark(w.getRemark());
- tModle.setQualifiedNum(0);
- tModle.setUnqualifiedNum(0);
+ tModle.setQualifiedNum(w.getQualifiedNum());
+ tModle.setUnqualifiedNum(w.getUnqualifiedNum());
tModle.setProUserId(w.getProUserId());
tModle.setProUserName(w.getProUserName());
tModle.setProUserName(w.getProUserName());
@@ -450,13 +450,17 @@
//浜у嚭鏃ユ湡
tModle.setProduceDate(r.getCreateTime());
}
- if(Constants.equalsInteger(r.getDoneType(),Constants.ZERO)){
+// if(Constants.equalsInteger(r.getDoneType(),Constants.ZERO)){
//濡傛灉鏄悎鏍间骇鍑�
- tModle.setQualifiedNum(tModle.getQualifiedNum()+Constants.formatBigdecimal(r.getNum()).intValue());
- }else{
+// tModle.setQualifiedNum(tModle.getQualifiedNum()+Constants.formatBigdecimal(r.getNum()).intValue());
+// }else{
//濡傛灉鏄笉鑹搧
- tModle.setUnqualifiedNum(tModle.getUnqualifiedNum()+Constants.formatBigdecimal(r.getNum()).intValue());
- }
+// tModle.setUnqualifiedNum(tModle.getUnqualifiedNum()+Constants.formatBigdecimal(r.getNum()).intValue());
+// }
+ //濡傛灉鏄悎鏍间骇鍑�
+ tModle.setQualifiedNum(tModle.getQualifiedNum());
+ //濡傛灉鏄笉鑹搧
+ tModle.setUnqualifiedNum(tModle.getUnqualifiedNum());
}
}
}
@@ -857,7 +861,7 @@
if(!Objects.isNull(plan.getWorkPlansId())){
//鏇存柊涓昏鍗曟暟鎹俊鎭�
if(plansMapper.selectCount(new QueryWrapper<Plans>()
- .eq("STATUS",Constants.PLAN_STATUS.done)
+ .in("STATUS",0,1,4,5)
.eq("DELETED",Constants.ZERO)
.ne("id",p.getId())
.eq("WORK_PLANS_ID",plan.getWorkPlansId()))<=Constants.ZERO){
@@ -998,7 +1002,7 @@
if(!Objects.isNull(plan.getWorkPlansId())){
//鏇存柊涓昏鍗曟暟鎹俊鎭�
if(plansMapper.selectCount(new QueryWrapper<Plans>()
- .eq("STATUS",Constants.PLAN_STATUS.done)
+ .in("STATUS",0,1,4,5)
.eq("DELETED",Constants.ZERO)
.ne("id",p.getId())
.eq("WORK_PLANS_ID",plan.getWorkPlansId()))<=Constants.ZERO){
--
Gitblit v1.9.3