fix: 78120
企标计划-制修订类型没有这两个字段,要么是制定要么是修订
This commit is contained in:
+2
@@ -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);
|
||||
}
|
||||
|
||||
// 完成时间变更
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
|
||||
+2
-2
@@ -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;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user