From ff93603d5a7d30d380f0ef1bb4a2303b547752e9 Mon Sep 17 00:00:00 2001 From: wangzhijiang <12345678> Date: Tue, 31 May 2022 09:36:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8F=91=E9=80=81=E6=B6=88?= =?UTF-8?q?=E6=81=AF-=E5=AE=9A=E6=97=B6=E5=99=A8=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/job/InventoryAffirmJob.java | 40 ++++++++++--------- .../jero/modules/project/job/PrehomoJob.java | 40 ++++++++++--------- .../project/job/VerifyComplianceJob.java | 40 ++++++++++--------- .../project/job/designComplianceJob.java | 40 ++++++++++--------- 4 files changed, 85 insertions(+), 75 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 514a1d1ed..f0db53c87 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 @@ -89,29 +89,31 @@ public class InventoryAffirmJob implements Job { for (ProjectLawsInventoryEO projectLawsInventoryEO : projectLawsInventoryEOList) { if(StringUtils.equals(projectLibraryBase.getId(),projectLawsInventoryEO.getProjectLibraryId())){ - //如果清单确认结束日期是当前日期 - if(StringUtils.equals(currentDateStr,sdf.format(projectLawsInventoryEO.getInventoryAffirmDueDate()))){ - if(StringUtils.isEmpty(projectLawsInventoryEO.getSendMsgFlag())){ - if(StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId())){ - currentDaysUserIdList.add(projectLawsInventoryEO.getRegulationOwnerId()); - }if(StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerId())){ - currentDaysUserIdList.add(projectLawsInventoryEO.getHomologationEngineerId()); + if(projectLawsInventoryEO.getInventoryAffirmDueDate() != null){ + //如果清单确认结束日期是当前日期 + if(StringUtils.equals(currentDateStr,sdf.format(projectLawsInventoryEO.getInventoryAffirmDueDate()))){ + if(StringUtils.isEmpty(projectLawsInventoryEO.getSendMsgFlag())){ + if(StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId())){ + currentDaysUserIdList.add(projectLawsInventoryEO.getRegulationOwnerId()); + }if(StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerId())){ + currentDaysUserIdList.add(projectLawsInventoryEO.getHomologationEngineerId()); + } + projectLawsInventoryEO.setSendMsgFlag(SendMsgFlagEnum.FALSE.getValue()); + projectLawsInventoryEOMapper.updateById(projectLawsInventoryEO); } - projectLawsInventoryEO.setSendMsgFlag(SendMsgFlagEnum.FALSE.getValue()); - projectLawsInventoryEOMapper.updateById(projectLawsInventoryEO); } - } - //如果清单确认结束时间是当前系统时间后三天 - if(StringUtils.equals(threeDaysStr,sdf.format(projectLawsInventoryEO.getInventoryAffirmDueDate()))){ - if(StringUtils.isEmpty(projectLawsInventoryEO.getSendMsgCurrentFlag())){ - if(StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId())){ - threeDaysUserIdList.add(projectLawsInventoryEO.getRegulationOwnerId()); - }if(StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerId())){ - threeDaysUserIdList.add(projectLawsInventoryEO.getHomologationEngineerId()); + //如果清单确认结束时间是当前系统时间后三天 + if(StringUtils.equals(threeDaysStr,sdf.format(projectLawsInventoryEO.getInventoryAffirmDueDate()))){ + if(StringUtils.isEmpty(projectLawsInventoryEO.getSendMsgCurrentFlag())){ + if(StringUtils.isNotEmpty(projectLawsInventoryEO.getRegulationOwnerId())){ + threeDaysUserIdList.add(projectLawsInventoryEO.getRegulationOwnerId()); + }if(StringUtils.isNotEmpty(projectLawsInventoryEO.getHomologationEngineerId())){ + threeDaysUserIdList.add(projectLawsInventoryEO.getHomologationEngineerId()); + } + projectLawsInventoryEO.setSendMsgCurrentFlag(SendMsgFlagEnum.FALSE.getValue()); + projectLawsInventoryEOMapper.updateById(projectLawsInventoryEO); } - projectLawsInventoryEO.setSendMsgCurrentFlag(SendMsgFlagEnum.FALSE.getValue()); - projectLawsInventoryEOMapper.updateById(projectLawsInventoryEO); } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java index 179610e05..0d4a7ce4a 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/PrehomoJob.java @@ -97,28 +97,30 @@ public class PrehomoJob implements Job { for (ProjectTaskInventoryEO projectTaskInventoryEO : projectTaskInventoryEOList) { if(StringUtils.equals(projectTaskInventoryEO.getProjectLawsInventoryId(),projectLawsInventoryEO.getId())){ - //如果prehomo - 结束日期是当前日期 - if(StringUtils.equals(currentDateStr,sdf.format(projectLawsInventoryEO.getPrehomoDueDate()))){ - if(StringUtils.isEmpty(projectTaskInventoryEO.getPrehomoSendMsgFlag())){ - if(StringUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoDutyId())){ - currentDaysUserIdList.add(projectLawsInventoryEO.getPrehomoDutyId()); - }if(StringUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoInitiatorId())){ - currentDaysUserIdList.add(projectLawsInventoryEO.getPrehomoInitiatorId()); + if(projectLawsInventoryEO.getPrehomoDueDate() != null){ +//如果prehomo - 结束日期是当前日期 + if(StringUtils.equals(currentDateStr,sdf.format(projectLawsInventoryEO.getPrehomoDueDate()))){ + if(StringUtils.isEmpty(projectTaskInventoryEO.getPrehomoSendMsgFlag())){ + if(StringUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoDutyId())){ + currentDaysUserIdList.add(projectLawsInventoryEO.getPrehomoDutyId()); + }if(StringUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoInitiatorId())){ + currentDaysUserIdList.add(projectLawsInventoryEO.getPrehomoInitiatorId()); + } + projectTaskInventoryEO.setPrehomoSendMsgFlag(SendMsgFlagEnum.FALSE.getValue()); + projectTaskInventoryEOService.updateById(projectTaskInventoryEO); } - projectTaskInventoryEO.setPrehomoSendMsgFlag(SendMsgFlagEnum.FALSE.getValue()); - projectTaskInventoryEOService.updateById(projectTaskInventoryEO); } - } - //如果prehomo - 结束日期是三天后的日期 - if(StringUtils.equals(threeDaysStr,sdf.format(projectLawsInventoryEO.getPrehomoDueDate()))){ - if(StringUtils.isEmpty(projectTaskInventoryEO.getPrehomoSendMsgCurrentFlag())){ - if(StringUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoDutyId())){ - threeDaysUserIdList.add(projectLawsInventoryEO.getPrehomoDutyId()); - }if(StringUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoInitiatorId())){ - threeDaysUserIdList.add(projectLawsInventoryEO.getPrehomoInitiatorId()); + //如果prehomo - 结束日期是三天后的日期 + if(StringUtils.equals(threeDaysStr,sdf.format(projectLawsInventoryEO.getPrehomoDueDate()))){ + if(StringUtils.isEmpty(projectTaskInventoryEO.getPrehomoSendMsgCurrentFlag())){ + if(StringUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoDutyId())){ + threeDaysUserIdList.add(projectLawsInventoryEO.getPrehomoDutyId()); + }if(StringUtils.isNotEmpty(projectLawsInventoryEO.getPrehomoInitiatorId())){ + threeDaysUserIdList.add(projectLawsInventoryEO.getPrehomoInitiatorId()); + } + projectTaskInventoryEO.setPrehomoSendMsgCurrentFlag(SendMsgFlagEnum.FALSE.getValue()); + projectTaskInventoryEOService.updateById(projectTaskInventoryEO); } - projectTaskInventoryEO.setPrehomoSendMsgCurrentFlag(SendMsgFlagEnum.FALSE.getValue()); - projectTaskInventoryEOService.updateById(projectTaskInventoryEO); } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java index cfa397b60..7ce1a0224 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/VerifyComplianceJob.java @@ -97,28 +97,30 @@ public class VerifyComplianceJob implements Job { for (ProjectTaskInventoryEO projectTaskInventoryEO : projectTaskInventoryEOList) { if(StringUtils.equals(projectTaskInventoryEO.getProjectLawsInventoryId(),projectLawsInventoryEO.getId())){ - //如果验证符合性 - 结束日期是当前日期 - if(StringUtils.equals(currentDateStr,sdf.format(projectLawsInventoryEO.getVerifyDueDate()))){ - if(StringUtils.isEmpty(projectTaskInventoryEO.getVerifySendMsgFlag())){ - if(StringUtils.isNotEmpty(projectLawsInventoryEO.getVerifyDutyId())){ - currentDaysUserIdList.add(projectLawsInventoryEO.getVerifyDutyId()); - }if(StringUtils.isNotEmpty(projectLawsInventoryEO.getVerifyInitiatorId())){ - currentDaysUserIdList.add(projectLawsInventoryEO.getVerifyInitiatorId()); + if(projectLawsInventoryEO.getVerifyDueDate() != null){ + //如果验证符合性 - 结束日期是当前日期 + if(StringUtils.equals(currentDateStr,sdf.format(projectLawsInventoryEO.getVerifyDueDate()))){ + if(StringUtils.isEmpty(projectTaskInventoryEO.getVerifySendMsgFlag())){ + if(StringUtils.isNotEmpty(projectLawsInventoryEO.getVerifyDutyId())){ + currentDaysUserIdList.add(projectLawsInventoryEO.getVerifyDutyId()); + }if(StringUtils.isNotEmpty(projectLawsInventoryEO.getVerifyInitiatorId())){ + currentDaysUserIdList.add(projectLawsInventoryEO.getVerifyInitiatorId()); + } + projectTaskInventoryEO.setVerifySendMsgFlag(SendMsgFlagEnum.FALSE.getValue()); + projectTaskInventoryEOService.updateById(projectTaskInventoryEO); } - projectTaskInventoryEO.setVerifySendMsgFlag(SendMsgFlagEnum.FALSE.getValue()); - projectTaskInventoryEOService.updateById(projectTaskInventoryEO); } - } - //如果验证符合性 - 结束日期是三天后的日期 - if(StringUtils.equals(threeDaysStr,sdf.format(projectLawsInventoryEO.getVerifyDueDate()))){ - if(StringUtils.isEmpty(projectTaskInventoryEO.getVerifySendMsgCurrentFlag())){ - if(StringUtils.isNotEmpty(projectLawsInventoryEO.getVerifyDutyId())){ - threeDaysUserIdList.add(projectLawsInventoryEO.getVerifyDutyId()); - }if(StringUtils.isNotEmpty(projectLawsInventoryEO.getVerifyInitiatorId())){ - threeDaysUserIdList.add(projectLawsInventoryEO.getVerifyInitiatorId()); + //如果验证符合性 - 结束日期是三天后的日期 + if(StringUtils.equals(threeDaysStr,sdf.format(projectLawsInventoryEO.getVerifyDueDate()))){ + if(StringUtils.isEmpty(projectTaskInventoryEO.getVerifySendMsgCurrentFlag())){ + if(StringUtils.isNotEmpty(projectLawsInventoryEO.getVerifyDutyId())){ + threeDaysUserIdList.add(projectLawsInventoryEO.getVerifyDutyId()); + }if(StringUtils.isNotEmpty(projectLawsInventoryEO.getVerifyInitiatorId())){ + threeDaysUserIdList.add(projectLawsInventoryEO.getVerifyInitiatorId()); + } + projectTaskInventoryEO.setVerifySendMsgCurrentFlag(SendMsgFlagEnum.FALSE.getValue()); + projectTaskInventoryEOService.updateById(projectTaskInventoryEO); } - projectTaskInventoryEO.setVerifySendMsgCurrentFlag(SendMsgFlagEnum.FALSE.getValue()); - projectTaskInventoryEOService.updateById(projectTaskInventoryEO); } } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java index 538d6a235..95b1c7a8d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/designComplianceJob.java @@ -95,29 +95,33 @@ public class designComplianceJob implements Job { for (ProjectTaskInventoryEO projectTaskInventoryEO : projectTaskInventoryEOList) { if(StringUtils.equals(projectTaskInventoryEO.getProjectLawsInventoryId(),projectLawsInventoryEO.getId())){ //如果设计符合性 - 结束日期是当前日期 - if(StringUtils.equals(currentDateStr,sdf.format(projectLawsInventoryEO.getDesignDueDate()))){ - if(StringUtils.isEmpty(projectTaskInventoryEO.getDesignSendMsgFlag())){ - if(StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignDutyId())){ - currentDaysUserIdList.add(projectLawsInventoryEO.getDesignDutyId()); - }if(StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignInitiatorId())){ - currentDaysUserIdList.add(projectLawsInventoryEO.getDesignInitiatorId()); + if(projectLawsInventoryEO.getDesignDueDate() != null){ + if(StringUtils.equals(currentDateStr,sdf.format(projectLawsInventoryEO.getDesignDueDate()))){ + if(StringUtils.isEmpty(projectTaskInventoryEO.getDesignSendMsgFlag())){ + if(StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignDutyId())){ + currentDaysUserIdList.add(projectLawsInventoryEO.getDesignDutyId()); + }if(StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignInitiatorId())){ + currentDaysUserIdList.add(projectLawsInventoryEO.getDesignInitiatorId()); + } + projectTaskInventoryEO.setDesignSendMsgFlag(SendMsgFlagEnum.FALSE.getValue()); + projectTaskInventoryEOService.updateById(projectTaskInventoryEO); } - projectTaskInventoryEO.setDesignSendMsgFlag(SendMsgFlagEnum.FALSE.getValue()); - projectTaskInventoryEOService.updateById(projectTaskInventoryEO); } - } - //如果设计符合性 - 结束日期是三天后的日期 - if(StringUtils.equals(threeDaysStr,sdf.format(projectLawsInventoryEO.getDesignDueDate()))){ - if(StringUtils.isEmpty(projectTaskInventoryEO.getDesignSendMsgCurrentFlag())){ - if(StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignDutyId())){ - threeDaysUserIdList.add(projectLawsInventoryEO.getDesignDutyId()); - }if(StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignInitiatorId())){ - threeDaysUserIdList.add(projectLawsInventoryEO.getDesignInitiatorId()); + + //如果设计符合性 - 结束日期是三天后的日期 + if(StringUtils.equals(threeDaysStr,sdf.format(projectLawsInventoryEO.getDesignDueDate()))){ + if(StringUtils.isEmpty(projectTaskInventoryEO.getDesignSendMsgCurrentFlag())){ + if(StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignDutyId())){ + threeDaysUserIdList.add(projectLawsInventoryEO.getDesignDutyId()); + }if(StringUtils.isNotEmpty(projectLawsInventoryEO.getDesignInitiatorId())){ + threeDaysUserIdList.add(projectLawsInventoryEO.getDesignInitiatorId()); + } + projectTaskInventoryEO.setDesignSendMsgCurrentFlag(SendMsgFlagEnum.FALSE.getValue()); + projectTaskInventoryEOService.updateById(projectTaskInventoryEO); } - projectTaskInventoryEO.setDesignSendMsgCurrentFlag(SendMsgFlagEnum.FALSE.getValue()); - projectTaskInventoryEOService.updateById(projectTaskInventoryEO); } } + } } if(CollectionUtils.isNotEmpty(threeDaysUserIdList)){