From a5120ba560ce893692a45f28e349e4a83cec2b9d Mon Sep 17 00:00:00 2001
From: Ledo <Watch13755@#.>
Date: Mon, 17 Feb 2025 20:49:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E6=9C=AA=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessDesignServiceImpl.java             | 33 +++++++++----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processdesign/ProcessDesignServiceImpl.java b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processdesign/ProcessDesignServiceImpl.java
index 0bf5e5c..3e9b44f 100644
--- a/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processdesign/ProcessDesignServiceImpl.java
+++ b/mes-module-heli/mes-module-heli-biz/src/main/java/com/chanko/yunxi/mes/module/heli/service/processdesign/ProcessDesignServiceImpl.java
@@ -84,23 +84,6 @@ public class ProcessDesignServiceImpl implements ProcessDesignService {
                         processDesignProgressDO.setRemark(reqVO.getRemark());
                     }
                     processDesignProgressMapper.insert(processDesignProgressDO);
-                    if (newProgress.compareTo(OVER_PROGRESS_VALUE) == 0){
-                        //如果进度为100%，要删除待办提醒
-                        //1.查询父项拿到设计图纸类型
-                        ProcessDesignDO processDesignDO = processDesignMapper.selectById(reqVO.getZid());
-                        String designType = getDesignType(processDesignDO.getProcessDesignType().split("BLUEPRINT_")[1]);
-
-                        //2.查询待办是否有这个待办
-                        List<bdgzsomthingDO> bdgzsomthingDOList = bdgzsomthingMapper.selecteqintAttr12IsNull(processDesignDO.getPlanCode(), designType);
-                        //如果有就更新待办
-                        if (CollUtil.isNotEmpty(bdgzsomthingDOList)){
-                            for (bdgzsomthingDO bdgzsomthingDO : bdgzsomthingDOList) {
-                                bdgzsomthingDO.setAttr4("1");
-                                bdgzsomthingDO.setAttr12("0");
-                                bdgzsomthingMapper.updateById(bdgzsomthingDO);
-                            }
-                        }
-                    }
                 }
             }
         }else{
@@ -116,7 +99,23 @@ public class ProcessDesignServiceImpl implements ProcessDesignService {
             }
 
         }
+        if (newProgress.compareTo(OVER_PROGRESS_VALUE) == 0){
+            //如果进度为100%，要删除待办提醒
+            //1.查询父项拿到设计图纸类型
+            ProcessDesignDO processDesignDO = processDesignMapper.selectById(reqVO.getZid());
+            String designType = getDesignType(processDesignDO.getProcessDesignType().split("BLUEPRINT_")[1]);
 
+            //2.查询待办是否有这个待办
+            List<bdgzsomthingDO> bdgzsomthingDOList = bdgzsomthingMapper.selecteqintAttr12IsNull(processDesignDO.getPlanCode(), designType);
+            //如果有就更新待办
+            if (CollUtil.isNotEmpty(bdgzsomthingDOList)){
+                for (bdgzsomthingDO bdgzsomthingDO : bdgzsomthingDOList) {
+                    bdgzsomthingDO.setAttr4("1");
+                    bdgzsomthingDO.setAttr12("0");
+                    bdgzsomthingMapper.updateById(bdgzsomthingDO);
+                }
+            }
+        }
 
 
         return null;