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

Merge remote-tracking branch 'origin/thirdStage' into thirdStage

Browse Source
This commit is contained in:
yjz
2024-01-23 15:09:53 +08:00
parent 340785a7ef c6f60cf91c
commit 27f4e9e55e
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/listener/ProcessESInitChangeEndListener.java
+4 -1
View File
@@ -63,7 +63,10 @@ public class ProcessESInitChangeEndListener implements ExecutionListener {
processEsInitChange.setId(null); processEsInitChange.setId(null);
processEsInitChange.setProjectStatus(ESPProjectStatus.IN_PROGRESS.getValue()); processEsInitChange.setProjectStatus(ESPProjectStatus.IN_PROGRESS.getValue());
processEsInitChange.setChangeStatus(ESPChangeType.ADD.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); enterpriseStandardPlans = BeanCopyUtils.copyBeanList(processEsInitChanges, EnterpriseStandardPlan.class);
laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
+4
View File
@@ -219,7 +219,11 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
private void setInitChangeData(String standardNo, ProcessEsInitChange initChange, String processInstanceId) { private void setInitChangeData(String standardNo, ProcessEsInitChange initChange, String processInstanceId) {
Map<String, Object> es = commonService.getByIdAndModule(null, TableNameEnum.ENTERPRISE_STANDARDS.getValue(), "2", standardNo); 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) initChange.setProcessInstanceId(processInstanceId)
.setNewEnStandardNo(esUtil.changeStandardNumberYearNumber(standardNo, curYearNumber))
.setApplicationCategory(ESPApplicationCategoryEnum.INITIATION.getValue()) .setApplicationCategory(ESPApplicationCategoryEnum.INITIATION.getValue())
.setProjectType(ESPProjectType.MODIFY.getValue()) .setProjectType(ESPProjectType.MODIFY.getValue())
.setOriginEnStandardNo((String) es.get(FieldCommon.STANDARD_NUMBER)) .setOriginEnStandardNo((String) es.get(FieldCommon.STANDARD_NUMBER))