fix: 81134 企标复审计划--修订走完的流程,对应的企标计划制修订类型不正确
This commit is contained in:
+4
-1
@@ -63,7 +63,10 @@ public class ProcessESInitChangeEndListener implements ExecutionListener {
|
||||
processEsInitChange.setId(null);
|
||||
processEsInitChange.setProjectStatus(ESPProjectStatus.IN_PROGRESS.getValue());
|
||||
processEsInitChange.setChangeStatus(ESPChangeType.ADD.getValue());
|
||||
processEsInitChange.setApplicationCategory(ESPProjectType.ENACT.getValue());
|
||||
if (ESPProjectType.MODIFY.getValue().equals(projectType))
|
||||
processEsInitChange.setApplicationCategory(ESPProjectType.MODIFY.getValue());
|
||||
else
|
||||
processEsInitChange.setApplicationCategory(ESPProjectType.ENACT.getValue());
|
||||
}
|
||||
// 转换为企标计划数据并入库
|
||||
enterpriseStandardPlans = BeanCopyUtils.copyBeanList(processEsInitChanges, EnterpriseStandardPlan.class);
|
||||
|
||||
+4
@@ -219,7 +219,11 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
|
||||
|
||||
private void setInitChangeData(String standardNo, ProcessEsInitChange initChange, String processInstanceId) {
|
||||
Map<String, Object> es = commonService.getByIdAndModule(null, TableNameEnum.ENTERPRISE_STANDARDS.getValue(), "2", standardNo);
|
||||
// 获取当前年份
|
||||
Calendar date = Calendar.getInstance();
|
||||
String curYearNumber = String.valueOf(date.get(Calendar.YEAR));
|
||||
initChange.setProcessInstanceId(processInstanceId)
|
||||
.setNewEnStandardNo(esUtil.changeStandardNumberYearNumber(standardNo, curYearNumber))
|
||||
.setApplicationCategory(ESPApplicationCategoryEnum.INITIATION.getValue())
|
||||
.setProjectType(ESPProjectType.MODIFY.getValue())
|
||||
.setOriginEnStandardNo((String) es.get(FieldCommon.STANDARD_NUMBER))
|
||||
|
||||
Reference in New Issue
Block a user