修改查询参数

railway-business/src/main/java/com/railway/business/catenary/domain/BusJcab.java

@@ -62,6 +62,14 @@ public class BusJcab extends BaseEntity {
   @ApiModelProperty(value = "检查人")
   private String checkUser;
 
+  @ApiModelProperty(value = "检测表筛选参数 - 检查日期")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  @JsonFormat(pattern = "yyyy-MM-dd")
+  private LocalDate operationDate;
+
+  @ApiModelProperty(value = "检测表筛选参数 - 检查人")
+  private String operator;
+
   @ApiModelProperty(value = "确认人")
   private String confirmUser;
 

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

@@ -38,9 +38,16 @@ public abstract class BusJcabServiceImpl {
    * 列表
    */
   protected void setList(BusJcab jcab) {
-    // 设置查询权限
+    // 设置查询参数
     JcebQueryUtil.setBusJcab(jcab);
-    if(StringUtils.isNotEmpty(jcab.getOrderBy())){
+    if (StringUtils.isNotEmpty(jcab.getOperator()) && StringUtils.isEmpty(jcab.getCheckUser())) {
+      jcab.setCheckUser(jcab.getOperator());
+    }
+    if (StringUtils.isNotNull(jcab.getOperationDate()) && StringUtils.isNull(jcab.getCheckDate())) {
+      jcab.setCheckDate(jcab.getOperationDate());
+    }
+    // 设置查询权限
+    if (StringUtils.isNotEmpty(jcab.getOrderBy())) {
       jcab.setOrderBy(SqlUtil.humpToLine(jcab.getOrderBy()));
     } else {
       // 默认倒序排列
@@ -67,7 +74,7 @@ public abstract class BusJcabServiceImpl {
    * 更新
    */
   protected void setUpdate(BusJcab jcab) {
-    if(StringUtils.isNotEmpty(jcab.getStationId())){
+    if (StringUtils.isNotEmpty(jcab.getStationId())) {
       // 设置关联ID
       setDeptStationId(jcab);
     }