From 58ed14fac2aa33038d5a7ff2ad9db491f9c574fe Mon Sep 17 00:00:00 2001
From: wangzhijiang <12345678>
Date: Thu, 4 Aug 2022 15:48:42 +0800
Subject: [PATCH] =?UTF-8?q?57061=20=E6=B8=85=E5=8D=95=E7=A1=AE=E8=AE=A4?=
 =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=99=A8=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/modules/project/job/InventoryAffirmJob.java   | 10 ++++++----
 .../impl/ProjectLawsInventoryEOServiceImpl.java        |  2 ++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java
index bd9170331..d339bf66d 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java
@@ -105,9 +105,10 @@ public class InventoryAffirmJob implements Job {
                                 //如果清单确认结束日期是当前日期
                                 if(StringUtils.equals(currentDateStr,sdf.format(projectLawsInventoryEO.getInventoryAffirmDueDate()))){
                                     if(StringUtils.isEmpty(projectLawsInventoryEO.getSendMsgFlag())){
-                                        if(StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId())){
+                                        if(StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId()) && StringUtils.isEmpty(projectLawsInventoryEO.getRegulationOwnerSubmitStatus())){
                                             currentDaysUserIdList.add(projectLawsInventoryEO.getRegulationOwnerId());
-                                        }if(StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerId())){
+                                        }
+                                        if(StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerId()) && StringUtils.isEmpty(projectLawsInventoryEO.getHomologationEngineerSubmitStatus())){
                                             currentDaysUserIdList.add(projectLawsInventoryEO.getHomologationEngineerId());
                                         }
                                         projectLawsInventoryEO.setSendMsgFlag(SendMsgFlagEnum.FALSE.getValue());
@@ -118,9 +119,10 @@ public class InventoryAffirmJob implements Job {
                                 //如果清单确认结束时间是当前系统时间后三天
                                 if(StringUtils.equals(threeDaysStr,sdf.format(projectLawsInventoryEO.getInventoryAffirmDueDate()))){
                                     if(StringUtils.isEmpty(projectLawsInventoryEO.getSendMsgCurrentFlag())){
-                                        if(StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId())){
+                                        if(StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId()) && StringUtils.isEmpty(projectLawsInventoryEO.getRegulationOwnerSubmitStatus())){
                                             threeDaysUserIdList.add(projectLawsInventoryEO.getRegulationOwnerId());
-                                        }if(StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerId())){
+                                        }
+                                        if(StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerId()) && StringUtils.isEmpty(projectLawsInventoryEO.getHomologationEngineerSubmitStatus())){
                                             threeDaysUserIdList.add(projectLawsInventoryEO.getHomologationEngineerId());
                                         }
                                         projectLawsInventoryEO.setSendMsgCurrentFlag(SendMsgFlagEnum.FALSE.getValue());
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index b73b856cc..add32a051 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -4135,6 +4135,8 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 			updateWrapper.in(ProjectLawsInventoryEO::getId,idList);
 			updateWrapper.set(ProjectLawsInventoryEO::getRegulationOwnerSubmitStatus,null);
 			updateWrapper.set(ProjectLawsInventoryEO::getHomologationEngineerSubmitStatus,null);
+			updateWrapper.set(ProjectLawsInventoryEO::getSendMsgFlag,null);
+			updateWrapper.set(ProjectLawsInventoryEO::getSendMsgCurrentFlag,null);
 			super.update(projectLawsInventoryEO, updateWrapper);
 
 			QueryWrapper<ProjectTaskInventoryEO> taskInventoryQueryWrapper = new QueryWrapper<>();