From 0d9c19184e72995fd8f57266c1ac5cf7f875e30c Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期一, 04 九月 2023 10:39:57 +0800
Subject: [PATCH] 小程序
---
server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 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 78cc8f8..f094941 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java
@@ -370,7 +370,7 @@
rParam.setPlanId(pageWrap.getId());
rParam.setDeleted(Constants.ZERO);
//宸插畬宸ユ暟閲�
-// plan.setDoneNum(0);
+ plan.setDoneNum(0);
//宸插垎閰嶆暟閲�
plan.setDistributNum(0);
//鏌ヨ鍏ㄩ儴鎶曟枡鍜屼骇鍑�
@@ -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