【CHG】兼容检测表筛选排序字段名

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

@@ -0,0 +1,44 @@
+package com.railway.business.catenary.enums;
+
+/**
+ * 排序字段名
+ *
+ * @author railway
+ */
+public enum JcebOrderEnum {
+  /** 排序字段名 */
+  CHECK_DATE("checkDate", "check_date", "检查日期"),
+  OPERATION_DATE("operationDate", "operation_date", "操作日期"),
+  ;
+
+  private final String attribute;
+  private final String field;
+  private final String notes;
+
+  JcebOrderEnum(String attribute, String field, String notes) {
+    this.attribute = attribute;
+    this.field = field;
+    this.notes = notes;
+  }
+
+  public String getAttribute() {
+    return attribute;
+  }
+
+  public String getField() {
+    return field;
+  }
+
+  public String getNotes() {
+    return notes;
+  }
+
+  public static JcebOrderEnum ofValue(String attribute) {
+    for (JcebOrderEnum investor : JcebOrderEnum.values()) {
+      if (investor.getAttribute().equals(attribute)) {
+        return investor;
+      }
+    }
+    return null;
+  }
+}

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

@@ -4,6 +4,7 @@ import com.railway.business.baseinfo.domain.BaseDeptStation;
 import com.railway.business.baseinfo.service.IBaseStationService;
 import com.railway.business.catenary.domain.BusJcab;
 import com.railway.business.catenary.domain.vo.JcebQueryVo;
+import com.railway.business.catenary.enums.JcebOrderEnum;
 import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.util.JcebQueryUtil;
 import com.railway.common.enums.DelFlagEnum;
@@ -49,9 +50,12 @@ public abstract class BusJcabServiceImpl {
     // 设置查询权限
     if (StringUtils.isNotEmpty(jcab.getOrderBy())) {
       jcab.setOrderBy(SqlUtil.humpToLine(jcab.getOrderBy()));
+      if(JcebOrderEnum.OPERATION_DATE.getField().equals(jcab.getOrderBy())){
+        jcab.setOrderBy(JcebOrderEnum.CHECK_DATE.getField());
+      }
     } else {
       // 默认倒序排列
-      jcab.setOrderBy("check_date");
+      jcab.setOrderBy(JcebOrderEnum.CHECK_DATE.getField());
       jcab.setIsAsc("0");
     }
   }

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

@@ -6,6 +6,7 @@ import com.railway.business.baseinfo.service.IBaseStationService;
 import com.railway.business.catenary.domain.BusJceb;
 import com.railway.business.catenary.domain.vo.JcebQueryVo;
 import com.railway.business.catenary.domain.vo.JcebRecordVo;
+import com.railway.business.catenary.enums.JcebOrderEnum;
 import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.mapper.BusJcebMapper;
 import com.railway.business.catenary.service.IBusJcebService;
@@ -78,7 +79,7 @@ public abstract class BusJcebServiceImpl<T extends BusJceb> implements IBusJcebS
       jceb.setOrderBy(SqlUtil.humpToLine(jceb.getOrderBy()));
     } else {
       // 默认倒序排列
-      jceb.setOrderBy("operation_date");
+      jceb.setOrderBy(JcebOrderEnum.OPERATION_DATE.getField());
       jceb.setIsAsc("0");
     }
   }