ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 80517 企标复审流程--业务基本信息--复审日期为空

Browse Source
This commit is contained in:
mzaxd
2024-01-11 16:55:03 +08:00
parent 48e370a1ed
commit 843e4218ca
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/entity/ProcessEsRecheck.java
+8
View File
@@ -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;
/**
* 主起草人
*/
laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESRecheckPlanJob.java
+5 -3
View File
@@ -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 {
laws-modules/src/main/java/com/jero/modules/laws/enterprise/job/ESTrialEndRecheckJob.java
+1 -1
View File
@@ -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);
}