【CHG】修改检测表查询参数

railway-business/src/main/java/com/railway/business/catenary/controller/BusJcebController.java

@@ -136,6 +136,7 @@ public class BusJcebController extends BaseController {
     startPage();
     JcebQueryUtil.setBusJcebQuery(query);
     JcebTypeEnum jcebTypeEnum = JcebTypeEnum.ofValue(query.getJcebType());
+    query.setJcebTypeText(jcebTypeEnum.getDescribe());
     List<JcebRecordVo> list = null;
     switch (jcebTypeEnum) {
       case Jddz:
@@ -288,7 +289,7 @@ public class BusJcebController extends BaseController {
           break;
       }
       if (null != jcebRecordVo) {
-        jcebRecordVo.setJcebType(jcebTypeEnum.getCode());
+        jcebRecordVo.setJcebType(jcebTypeEnum.getTypeCode());
         list.add(jcebRecordVo);
       }
     }

railway-business/src/main/java/com/railway/business/catenary/domain/vo/JcebQueryVo.java

@@ -19,6 +19,9 @@ public class JcebQueryVo implements Serializable {
   @ApiModelProperty(value = "检测表类型")
   private String jcebType;
 
+  @ApiModelProperty(value = "检测表类型")
+  private String jcebTypeText;
+
   @ApiModelProperty(value = "基础表数据记录id")
   private Long baseId;
 
@@ -40,7 +43,7 @@ public class JcebQueryVo implements Serializable {
   private LocalDate operationDate;
 
   @ApiModelProperty(value = "记录人/操作人")
-  private Long operator;
+  private String operator;
 
   @ApiModelProperty(value = "提交状态 0未提交 1已提交 2已退回 9已确认")
   private String submitState;

railway-business/src/main/java/com/railway/business/catenary/enums/JcebTypeEnum.java

@@ -24,25 +24,25 @@ public enum JcebTypeEnum {
   Wjcxc("wjcxc", "无交叉线岔"),
   ;
 
-  private final String code;
-  private final String type;
+  private final String typeCode;
+  private final String describe;
 
-  JcebTypeEnum(String code, String type) {
-    this.code = code;
-    this.type = type;
+  JcebTypeEnum(String typeCode, String describe) {
+    this.typeCode = typeCode;
+    this.describe = describe;
   }
 
-  public String getCode() {
-    return code;
+  public String getTypeCode() {
+    return typeCode;
   }
 
-  public String getType() {
-    return type;
+  public String getDescribe() {
+    return describe;
   }
 
   public static JcebTypeEnum ofValue(String code) {
     for (JcebTypeEnum investor : JcebTypeEnum.values()) {
-      if (investor.getCode().equals(code)) {
+      if (investor.getTypeCode().equals(code)) {
         return investor;
       }
     }

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcabServiceImpl.java

@@ -143,8 +143,8 @@ public abstract class BusJcabServiceImpl {
    */
   protected void pushSubmit(BusJcab jcab) {
     List<Long> leaderIds = stationService.getStationLeaderId(jcab.getDeptStationId());
-    String title = getJcebTypeEnum().getType() + "检查表需确认" ;
-    String content = "有一条" + getJcebTypeEnum().getType() + "检查表需确认,请您及时处理";
+    String title = getJcebTypeEnum().getDescribe() + "检查表需确认" ;
+    String content = "有一条" + getJcebTypeEnum().getDescribe() + "检查表需确认,请您及时处理";
     for(Long id : leaderIds){
       busPushMsgService.create(id, title, content, getPushParam(jcab));
     }
@@ -156,8 +156,8 @@ public abstract class BusJcabServiceImpl {
   protected void setReject(BusJcab jcab) {
     jcab.setConfirmUser(SecurityUtils.getUsername());
     jcab.setSubmitState(JcebStatusEnum.RETURNED.getCode());
-    String title = getJcebTypeEnum().getType() + "检查表被退回" ;
-    String content = "您提交的" + getJcebTypeEnum().getType() + "检查表被退回，点击查看详情";
+    String title = getJcebTypeEnum().getDescribe() + "检查表被退回" ;
+    String content = "您提交的" + getJcebTypeEnum().getDescribe() + "检查表被退回，点击查看详情";
     busPushMsgService.create(jcab.getCreateBy(), title, content, getPushParam(jcab));
   }
 
@@ -167,14 +167,14 @@ public abstract class BusJcabServiceImpl {
   protected void setConfirm(BusJcab jcab) {
     jcab.setConfirmUser(SecurityUtils.getUsername());
     jcab.setSubmitState(JcebStatusEnum.COMPLETED.getCode());
-    String title = getJcebTypeEnum().getType() + "检查表已确认" ;
-    String content = "您提交的" + getJcebTypeEnum().getType() + "检查表已确认，点击查看详情";
+    String title = getJcebTypeEnum().getDescribe() + "检查表已确认" ;
+    String content = "您提交的" + getJcebTypeEnum().getDescribe() + "检查表已确认，点击查看详情";
     busPushMsgService.create(jcab.getCreateBy(), title, content, getPushParam(jcab));
   }
 
   protected String getPushParam(BusJcab jcab){
     JSONObject json = new JSONObject();
-    json.put("type", getJcebTypeEnum().getCode());
+    json.put("type", getJcebTypeEnum().getTypeCode());
     json.put("id", jcab.getId());
     json.put("submitState", jcab.getSubmitState());
     return json.toJSONString();

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebServiceImpl.java

@@ -180,14 +180,14 @@ public abstract class BusJcebServiceImpl<T extends BusJceb> implements IBusJcebS
 
   protected String getPushParam(BusJceb jceb){
     JSONObject json = new JSONObject();
-    json.put("type", getJcebTypeEnum().getCode());
+    json.put("type", getJcebTypeEnum().getTypeCode());
     json.put("id", jceb.getId());
     json.put("submitState", jceb.getSubmitState());
     return json.toJSONString();
   }
 
   private String getJcebType(){
-    return getJcebTypeEnum().getType();
+    return getJcebTypeEnum().getDescribe();
   }
 
   /**

railway-business/src/main/resources/mapper/catenary/BusJcbBlqMapper.xml

@@ -575,7 +575,8 @@
   </resultMap>
 
   <select id="getListByType" resultMap="JcabResultMap">
-    SELECT t.id, v.dept_name, v.station_name, t.check_date, t.check_user, #{jcebType} as jcebType
+    SELECT t.id, v.dept_name, v.station_name, t.check_date, t.check_user, #{jcebType} as jcebType,
+    #{jcebTypeText} as jcebTypeText
     FROM bus_jcb_blq t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>

railway-business/src/main/resources/mapper/catenary/BusJcbDmcgyqMapper.xml

@@ -542,7 +542,8 @@
   </resultMap>
 
   <select id="getListByType" resultMap="JcabResultMap">
-    SELECT t.id, v.dept_name, v.station_name, t.check_date, t.check_user, #{jcebType} as jcebType
+    SELECT t.id, v.dept_name, v.station_name, t.check_date, t.check_user, #{jcebType} as jcebType,
+    #{jcebTypeText} as jcebTypeText
     FROM bus_jcb_dmcgyq t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>

railway-business/src/main/resources/mapper/catenary/BusJcbFdfxjyqMapper.xml

@@ -769,7 +769,8 @@
   </resultMap>
 
   <select id="getListByType" resultMap="JcabResultMap">
-    SELECT t.id, v.dept_name, v.station_name, t.check_date, t.check_user, #{jcebType} as jcebType
+    SELECT t.id, v.dept_name, v.station_name, t.check_date, t.check_user, #{jcebType} as jcebType,
+    #{jcebTypeText} as jcebTypeText
     FROM bus_jcb_fdfxjyq t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>

railway-business/src/main/resources/mapper/catenary/BusJcbGlkgMapper.xml

@@ -1038,7 +1038,8 @@
   </resultMap>
 
   <select id="getListByType" resultMap="JcabResultMap">
-    SELECT t.id, v.dept_name, v.station_name, t.check_date, t.check_user, #{jcebType} as jcebType
+    SELECT t.id, v.dept_name, v.station_name, t.check_date, t.check_user, #{jcebType} as jcebType,
+    #{jcebTypeText} as jcebTypeText
     FROM bus_jcb_glkg t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>

railway-business/src/main/resources/mapper/catenary/BusJcbJcxcMapper.xml

@@ -711,7 +711,8 @@
   </resultMap>
 
   <select id="getListByType" resultMap="JcabResultMap">
-    SELECT t.id, v.dept_name, v.station_name, t.check_date, t.check_user, #{jcebType} as jcebType
+    SELECT t.id, v.dept_name, v.station_name, t.check_date, t.check_user, #{jcebType} as jcebType,
+    #{jcebTypeText} as jcebTypeText
     FROM bus_jcb_jcxc t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>

railway-business/src/main/resources/mapper/catenary/BusJcbWjcxcMapper.xml

@@ -688,7 +688,8 @@
   </resultMap>
 
   <select id="getListByType" resultMap="JcabResultMap">
-    SELECT t.id, v.dept_name, v.station_name, t.check_date, t.check_user, #{jcebType} as jcebType
+    SELECT t.id, v.dept_name, v.station_name, t.check_date, t.check_user, #{jcebType} as jcebType,
+    #{jcebTypeText} as jcebTypeText
     FROM bus_jcb_wjcxc t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>

railway-business/src/main/resources/mapper/catenary/BusJcebFzswjfxcMapper.xml

@@ -411,7 +411,8 @@
   </resultMap>
 
   <select id="getListByType" resultMap="JcebResultMap">
-    SELECT t.id, v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType
+    SELECT t.id, v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType,
+    #{jcebTypeText} as jcebTypeText
     FROM bus_jceb_fzswjfxc t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>

railway-business/src/main/resources/mapper/catenary/BusJcebGjsfxMapper.xml

@@ -415,7 +415,8 @@
   </resultMap>
 
   <select id="getListByType" resultMap="JcebResultMap">
-    SELECT t.id, v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType
+    SELECT t.id, v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType,
+    #{jcebTypeText} as jcebTypeText
     FROM bus_jceb_gjsfx t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>

railway-business/src/main/resources/mapper/catenary/BusJcebJddzMapper.xml

@@ -339,7 +339,8 @@
   </resultMap>
 
   <select id="getListByType" resultMap="JcebResultMap">
-    SELECT t.id, v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType
+    SELECT t.id, v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType,
+    #{jcebTypeText} as jcebTypeText
     FROM bus_jceb_jddz t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>

railway-business/src/main/resources/mapper/catenary/BusJcebJyzqsjlMapper.xml

@@ -305,7 +305,8 @@
   </resultMap>
 
   <select id="getListByType" resultMap="JcebResultMap">
-    SELECT t.id, v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType
+    SELECT t.id, v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType,
+    #{jcebTypeText} as jcebTypeText
     FROM bus_jceb_jyzqsjl t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>

railway-business/src/main/resources/mapper/catenary/BusJcebLbjghjlMapper.xml

@@ -348,7 +348,8 @@
   </resultMap>
 
   <select id="getListByType" resultMap="JcebResultMap">
-    SELECT t.id, v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType
+    SELECT t.id, v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType,
+    #{jcebTypeText} as jcebTypeText
     FROM bus_jceb_lbjghjl t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>

railway-business/src/main/resources/mapper/catenary/BusJcebQmjcjlMapper.xml

@@ -385,7 +385,8 @@
   </resultMap>
 
   <select id="getListByType" resultMap="JcebResultMap">
-    SELECT t.id, v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType
+    SELECT t.id, v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType,
+    #{jcebTypeText} as jcebTypeText
     FROM bus_jceb_qmjcjl t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>

railway-business/src/main/resources/mapper/catenary/BusJcebXsjcjlMapper.xml

@@ -372,7 +372,8 @@
   </resultMap>
 
   <select id="getListByType" resultMap="JcebResultMap">
-    SELECT t.id, v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType
+    SELECT t.id, v.dept_name, v.station_name, t.operation_date, t.operator, #{jcebType} as jcebType,
+    #{jcebTypeText} as jcebTypeText
     FROM bus_jceb_xsjcjl t
     LEFT JOIN v_station v on t.dept_station_id = v.dept_station_id
     <where>