auth

safety-eval-client/src/main/java/org/qinan/safetyeval/client/co/institution/EvalProjectProgressCO.java

@@ -2,6 +2,7 @@ package org.qinan.safetyeval.client.co.institution;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.qinan.safetyeval.domain.constant.EvalTypeEnum;
 
 import java.time.LocalDate;
 import java.util.List;
@@ -27,8 +28,8 @@ public class EvalProjectProgressCO {
     @ApiModelProperty("客户负责人")
     private String customerContactName;
 
-    @ApiModelProperty("评价类型名称")
+    @ApiModelProperty(EvalTypeEnum.REMARKS)
-    private String evalTypeName;
+    private String evalTypeCode;
 
     @ApiModelProperty("项目负责人")
     private String projectLeaderName;

safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/EvalTypeEnum.java

@@ -12,6 +12,7 @@ public enum EvalTypeEnum {
 
     private final String code;
     private final String value;
+    public static final String REMARKS = "安全评价类型枚举: PRE=>安全预评价;ACCEPT:安全设施竣工验收评价;STATUS:安全现状评价";
 
     EvalTypeEnum(String code, String value) {
         this.code = code;

safety-eval-infrastructure/src/main/resources/mapper/EvalProjectMapper.xml

@@ -19,6 +19,7 @@
         p.customer_contact_name,
         p.project_leader_name,
         p.plan_end_date,
+        p.eval_type_code,
         p.project_node
         FROM eval_project p
         LEFT JOIN eval_customer c