From c6f60cf91c283629cbbf9b04c3413158598b1ebd Mon Sep 17 00:00:00 2001 From: caihaohan Date: Tue, 23 Jan 2024 15:01:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2081134=20=E4=BC=81=E6=A0=87=E5=A4=8D?= =?UTF-8?q?=E5=AE=A1=E8=AE=A1=E5=88=92--=E4=BF=AE=E8=AE=A2=E8=B5=B0?= =?UTF-8?q?=E5=AE=8C=E7=9A=84=E6=B5=81=E7=A8=8B=EF=BC=8C=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E7=9A=84=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E7=B1=BB=E5=9E=8B=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/ProcessESInitChangeEndListener.java | 5 ++++- .../service/impl/ProcessEsInitChangeServiceImpl.java | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) 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))