流程发送消息-定时器统一修改

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/InventoryAffirmJob.java

@@ -89,6 +89,7 @@ public class InventoryAffirmJob implements Job {
 
                     for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOList) {
                         if(StringUtils.equals(projectLibraryBase.getId(),projectLawsInventoryEO.getProjectLibraryId())){
+                            if(projectLawsInventoryEO.getInventoryAffirmDueDate() != null){
                                 //如果清单确认结束日期是当前日期
                                 if(StringUtils.equals(currentDateStr,sdf.format(projectLawsInventoryEO.getInventoryAffirmDueDate()))){
                                     if(StringUtils.isEmpty(projectLawsInventoryEO.getSendMsgFlag())){
@@ -116,6 +117,7 @@ public class InventoryAffirmJob implements Job {
                                 }
                             }
                         }
+                    }
 
                     if(CollectionUtils.isNotEmpty(threeDaysUserIdList)){
                         threeDaysUserIdList = threeDaysUserIdList.stream().distinct().collect(Collectors.toList());

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java

@@ -97,6 +97,7 @@ public class PrehomoJob implements Job {
 
                             for (ProjectTaskInventoryEO projectTaskInventoryEO : projectTaskInventoryEOList) {
                                 if(StringUtils.equals(projectTaskInventoryEO.getProjectLawsInventoryId(),projectLawsInventoryEO.getId())){
+                                    if(projectLawsInventoryEO.getPrehomoDueDate() != null){
 //如果prehomo - 结束日期是当前日期
                                         if(StringUtils.equals(currentDateStr,sdf.format(projectLawsInventoryEO.getPrehomoDueDate()))){
                                             if(StringUtils.isEmpty(projectTaskInventoryEO.getPrehomoSendMsgFlag())){
@@ -123,6 +124,7 @@ public class PrehomoJob implements Job {
                                         }
                                     }
                                 }
+                            }
                             if(CollectionUtils.isNotEmpty(threeDaysUserIdList)){
                                 threeDaysUserIdList = threeDaysUserIdList.stream().distinct().collect(Collectors.toList());
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java

@@ -97,6 +97,7 @@ public class VerifyComplianceJob implements Job {
 
                             for (ProjectTaskInventoryEO projectTaskInventoryEO : projectTaskInventoryEOList) {
                                 if(StringUtils.equals(projectTaskInventoryEO.getProjectLawsInventoryId(),projectLawsInventoryEO.getId())){
+                                    if(projectLawsInventoryEO.getVerifyDueDate() != null){
                                         //如果验证符合性 - 结束日期是当前日期
                                         if(StringUtils.equals(currentDateStr,sdf.format(projectLawsInventoryEO.getVerifyDueDate()))){
                                             if(StringUtils.isEmpty(projectTaskInventoryEO.getVerifySendMsgFlag())){
@@ -123,6 +124,7 @@ public class VerifyComplianceJob implements Job {
                                         }
                                     }
                                 }
+                            }
                             if(CollectionUtils.isNotEmpty(threeDaysUserIdList)){
                                 threeDaysUserIdList = threeDaysUserIdList.stream().distinct().collect(Collectors.toList());
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java

@@ -95,6 +95,7 @@ public class designComplianceJob implements Job {
                             for (ProjectTaskInventoryEO projectTaskInventoryEO : projectTaskInventoryEOList) {
                                 if(StringUtils.equals(projectTaskInventoryEO.getProjectLawsInventoryId(),projectLawsInventoryEO.getId())){
                                     //如果设计符合性 - 结束日期是当前日期
+                                    if(projectLawsInventoryEO.getDesignDueDate() != null){
                                         if(StringUtils.equals(currentDateStr,sdf.format(projectLawsInventoryEO.getDesignDueDate()))){
                                             if(StringUtils.isEmpty(projectTaskInventoryEO.getDesignSendMsgFlag())){
                                                 if(StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignDutyId())){
@@ -106,6 +107,7 @@ public class designComplianceJob implements Job {
                                                 projectTaskInventoryEOService.updateById(projectTaskInventoryEO);
                                             }
                                         }
+
                                         //如果设计符合性 - 结束日期是三天后的日期
                                         if(StringUtils.equals(threeDaysStr,sdf.format(projectLawsInventoryEO.getDesignDueDate()))){
                                             if(StringUtils.isEmpty(projectTaskInventoryEO.getDesignSendMsgCurrentFlag())){
@@ -119,6 +121,8 @@ public class designComplianceJob implements Job {
                                             }
                                         }
                                     }
+
+                                }
                             }
                             if(CollectionUtils.isNotEmpty(threeDaysUserIdList)){
                                 threeDaysUserIdList = threeDaysUserIdList.stream().distinct().collect(Collectors.toList());