From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 16b82d8..f094941 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/WorkorderExtServiceImpl.java
@@ -861,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){
@@ -1002,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