From bb82c543675698d16eb80ae2bc6b82593fae8491 Mon Sep 17 00:00:00 2001 From: Mr.Shi <1878285526@qq.com> Date: 星期一, 21 八月 2023 11:11:17 +0800 Subject: [PATCH] Merge branch 'master' of ssh://139.186.142.91:29418/productDev/dmMes --- 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