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

fix: 78120

Browse Source 
企标计划-制修订类型没有这两个字段，要么是制定要么是修订
This commit is contained in:
mzaxd
2023-11-03 18:03:32 +08:00
parent 8c67cd6961
commit 12986a3a54
3 changed files with 5 additions and 3 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
+2
View File
@@ -54,6 +54,7 @@ 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());
} }
// 转换为企标计划数据并入库 // 转换为企标计划数据并入库
enterpriseStandardPlans = BeanCopyUtils.copyBeanList(processEsInitChanges, EnterpriseStandardPlan.class); enterpriseStandardPlans = BeanCopyUtils.copyBeanList(processEsInitChanges, EnterpriseStandardPlan.class);
@@ -62,6 +63,7 @@ public class ProcessESInitChangeEndListener implements ExecutionListener {
// 将Id设为企标计划的Id // 将Id设为企标计划的Id
for (ProcessEsInitChange processEsInitChange : processEsInitChanges) { for (ProcessEsInitChange processEsInitChange : processEsInitChanges) {
processEsInitChange.setId(processEsInitChange.getEspId()); processEsInitChange.setId(processEsInitChange.getEspId());
processEsInitChange.setApplicationCategory(null);
} }
// 完成时间变更 // 完成时间变更
laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/EnterpriseStandardPlan.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class EnterpriseStandardPlan implements Serializable {
@ApiModelProperty(value = "流程说明") @ApiModelProperty(value = "流程说明")
private String processDescription; private String processDescription;
@Dict(dicCode = "esp_application_category") @Dict(dicCode = "esp_revision_type")
@ApiModelProperty(value = "申请类别") @ApiModelProperty(value = "申请类别")
private String applicationCategory; private String applicationCategory;
laws-modules/src/main/java/com/jero/modules/laws/enterprise/entity/vo/EnterpriseStandardPlanVo.java
+2 -2
View File
@@ -25,8 +25,8 @@ public class EnterpriseStandardPlanVo {
@ApiModelProperty(value = "主键ID") @ApiModelProperty(value = "主键ID")
private String id; private String id;
@Excel(name = "申请类别", width = 15, orderNum = "1", dicCode = "esp_application_category") @Excel(name = "申请类别", width = 15, orderNum = "1", dicCode = "esp_revision_type")
@Dict(dicCode = "esp_application_category") @Dict(dicCode = "esp_revision_type")
@ApiModelProperty(value = "申请类别（制订/修订，立项/变更）") @ApiModelProperty(value = "申请类别（制订/修订，立项/变更）")
private String applicationCategory; private String applicationCategory;