From 12986a3a54c150d99dd5c792b370c72cb1e841d6 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 3 Nov 2023 18:03:32 +0800 Subject: [PATCH] fix: 78120 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 企标计划-制修订类型没有这两个字段，要么是制定要么是修订 --- .../esInitChange/listener/ProcessESInitChangeEndListener.java | 2 ++ .../laws/enterprise/entity/EnterpriseStandardPlan.java | 2 +- .../laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) 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 84e3e8e1..eb279df1 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 @@ -54,6 +54,7 @@ public class ProcessESInitChangeEndListener implements ExecutionListener { processEsInitChange.setId(null); processEsInitChange.setProjectStatus(ESPProjectStatus.IN_PROGRESS.getValue()); processEsInitChange.setChangeStatus(ESPChangeType.ADD.getValue()); + processEsInitChange.setApplicationCategory(ESPProjectType.ENACT.getValue()); } // 转换为企标计划数据并入库 enterpriseStandardPlans = BeanCopyUtils.copyBeanList(processEsInitChanges, EnterpriseStandardPlan.class); @@ -62,6 +63,7 @@ public class ProcessESInitChangeEndListener implements ExecutionListener { // 将Id设为企标计划的Id for (ProcessEsInitChange processEsInitChange : processEsInitChanges) { processEsInitChange.setId(processEsInitChange.getEspId()); + processEsInitChange.setApplicationCategory(null); } // 完成时间变更 diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlan.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlan.java index 67f6f0d1..b1547609 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlan.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlan.java @@ -67,7 +67,7 @@ public class EnterpriseStandardPlan implements Serializable { @ApiModelProperty(value = "流程说明") private String processDescription; - @Dict(dicCode = "esp_application_category") + @Dict(dicCode = "esp_revision_type") @ApiModelProperty(value = "申请类别") private String applicationCategory; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java index 9e6fa26e..9df5ad79 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java @@ -25,8 +25,8 @@ public class EnterpriseStandardPlanVo { @ApiModelProperty(value = "主键ID") private String id; - @Excel(name = "申请类别", width = 15, orderNum = "1", dicCode = "esp_application_category") - @Dict(dicCode = "esp_application_category") + @Excel(name = "申请类别", width = 15, orderNum = "1", dicCode = "esp_revision_type") + @Dict(dicCode = "esp_revision_type") @ApiModelProperty(value = "申请类别（制订/修订，立项/变更）") private String applicationCategory;