diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/entity/ProcessEsRecheck.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/entity/ProcessEsRecheck.java index 890f1d0f..9316c145 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/entity/ProcessEsRecheck.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/entity/ProcessEsRecheck.java @@ -107,6 +107,14 @@ public class ProcessEsRecheck implements Serializable { @ApiModelProperty(value = "实施日期") private Date implementationDate; + /** + * 复审日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern="yyyy-MM-dd") + @ApiModelProperty(value = "复审日期") + private Date recheckDate; + /** * 主起草人 */ diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESRecheckPlanJob.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESRecheckPlanJob.java index 4b004ab8..b1c772a2 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESRecheckPlanJob.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESRecheckPlanJob.java @@ -102,7 +102,7 @@ public class ESRecheckPlanJob implements Job { continue; } // 构建发起流程数据 - ESRecheckDataVO esRecheckDataVO = getEsRecheckDataVO(es, standardizationUser, standardEngineer, recheckPlan.getId()); + ESRecheckDataVO esRecheckDataVO = getEsRecheckDataVO(es, standardizationUser, standardEngineer, recheckPlan); // 发起流程 recheckService.autoStartProcess(esRecheckDataVO); } @@ -111,12 +111,14 @@ public class ESRecheckPlanJob implements Job { log.info("企标复审计划定时任务执行完成"); } - public static ESRecheckDataVO getEsRecheckDataVO(LawsEnterpriseStandard es, String standardizationUser, String standardEngineer, String recheckPlanId) { + public static ESRecheckDataVO getEsRecheckDataVO(LawsEnterpriseStandard es, String standardizationUser + , String standardEngineer, EnterpriseStandardRecheckPlan recheckPlan) { ESRecheckDataVO esRecheckDataVO = new ESRecheckDataVO(); ProcessEsRecheck recheck = BeanCopyUtils.copyBean(es, ProcessEsRecheck.class); recheck.setId(null); recheck.setStandardId(es.getId()); - recheck.setRecheckPlanId(recheckPlanId); + recheck.setRecheckPlanId(recheckPlan.getId()); + recheck.setRecheckDate(recheckPlan.getRecheckDate()); if (standardizationUser == null) { recheck.setShowFirstNode(YesOrNoEnum.YES.getInteger()); } else { diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESTrialEndRecheckJob.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESTrialEndRecheckJob.java index 759070aa..ad62e83e 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESTrialEndRecheckJob.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESTrialEndRecheckJob.java @@ -102,7 +102,7 @@ public class ESTrialEndRecheckJob implements Job { continue; } // 构建发起流程数据 - ESRecheckDataVO esRecheckDataVO = ESRecheckPlanJob.getEsRecheckDataVO(es, standardizationUser, standardEngineer, recheckPlan.getId()); + ESRecheckDataVO esRecheckDataVO = ESRecheckPlanJob.getEsRecheckDataVO(es, standardizationUser, standardEngineer, recheckPlan); // 发起流程 recheckService.autoStartProcess(esRecheckDataVO); }