fix: 复审流程自动发起保存复审计划Id

This commit is contained in:
2023-12-12 11:44:08 +08:00
parent 598707a090
commit 68c1db8170
@@ -14,7 +14,6 @@ import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
import com.jero.modules.laws.system.service.ILawsContactManageService; import com.jero.modules.laws.system.service.ILawsContactManageService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.jetbrains.annotations.NotNull;
import org.quartz.Job; import org.quartz.Job;
import org.quartz.JobExecutionContext; import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException; import org.quartz.JobExecutionException;
@@ -103,7 +102,7 @@ public class ESRecheckPlanJob implements Job {
continue; continue;
} }
// 构建发起流程数据 // 构建发起流程数据
ESRecheckDataVO esRecheckDataVO = this.getEsRecheckDataVO(es, standardizationUser, standardEngineer); ESRecheckDataVO esRecheckDataVO = this.getEsRecheckDataVO(es, standardizationUser, standardEngineer, recheckPlan.getId());
// 发起流程 // 发起流程
recheckService.autoStartProcess(esRecheckDataVO); recheckService.autoStartProcess(esRecheckDataVO);
} }
@@ -112,7 +111,7 @@ public class ESRecheckPlanJob implements Job {
log.info("企标复审计划定时任务执行完成"); log.info("企标复审计划定时任务执行完成");
} }
private ESRecheckDataVO getEsRecheckDataVO(LawsEnterpriseStandard es, String standardizationUser, String standardEngineer) { private ESRecheckDataVO getEsRecheckDataVO(LawsEnterpriseStandard es, String standardizationUser, String standardEngineer, String recheckPlanId) {
ESRecheckDataVO esRecheckDataVO = new ESRecheckDataVO(); ESRecheckDataVO esRecheckDataVO = new ESRecheckDataVO();
ProcessEsRecheck recheck = BeanCopyUtils.copyBean(es, ProcessEsRecheck.class); ProcessEsRecheck recheck = BeanCopyUtils.copyBean(es, ProcessEsRecheck.class);
recheck.setId(null); recheck.setId(null);
@@ -122,6 +121,7 @@ public class ESRecheckPlanJob implements Job {
} else { } else {
recheck.setShowFirstNode(YesOrNoEnum.NO.getInteger()); recheck.setShowFirstNode(YesOrNoEnum.NO.getInteger());
} }
recheck.setRecheckPlanId(recheckPlanId);
CommonVO commonVO = new CommonVO(); CommonVO commonVO = new CommonVO();
commonVO.setPrcName(es.getStandardNumber() + "-" + es.getStandardName() + "-复审"); commonVO.setPrcName(es.getStandardNumber() + "-" + es.getStandardName() + "-复审");
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();