diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/listener/ProcessESInitChangeEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/listener/ProcessESInitChangeEndListener.java index 5f5303ee..14f3b847 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/listener/ProcessESInitChangeEndListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/listener/ProcessESInitChangeEndListener.java @@ -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); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java index c6519602..82c7b73e 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java @@ -219,7 +219,11 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl 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))