【CHG】修改查询条件

railway-business/src/main/java/com/railway/business/bi/domain/vo/TestPlanKgQuery.java

@@ -1,6 +1,7 @@
 package com.railway.business.bi.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
@@ -33,21 +34,25 @@ public class TestPlanKgQuery implements Serializable {
   private String substationName;
 
   @ApiModelProperty(value = "计划时间开始")
+  @JsonProperty(value = "testPlanDate_Start")
   @JsonFormat(pattern = "yyyy-MM-dd")
   @DateTimeFormat(pattern = "yyyy-MM-dd")
   private LocalDate testPlanDateStart;
 
   @ApiModelProperty(value = "计划时间结束")
+  @JsonProperty(value = "testPlanDate_End")
   @JsonFormat(pattern = "yyyy-MM-dd")
   @DateTimeFormat(pattern = "yyyy-MM-dd")
   private LocalDate testPlanDateEnd;
 
   @ApiModelProperty(value = "实际时间开始")
+  @JsonProperty(value = "completionDate_Start")
   @JsonFormat(pattern = "yyyy-MM-dd")
   @DateTimeFormat(pattern = "yyyy-MM-dd")
   private LocalDate completionDateStart;
 
   @ApiModelProperty(value = "实际时间结束")
+  @JsonProperty(value = "completionDate_End")
   @JsonFormat(pattern = "yyyy-MM-dd")
   @DateTimeFormat(pattern = "yyyy-MM-dd")
   private LocalDate completionDateEnd;

railway-business/src/main/resources/mapper/bi/ShowBdycMapper.xml

@@ -237,7 +237,8 @@
         and zrbm like concat('%', #{zrbm}, '%')
       </if>
       <if test="rectifyResult!=null and rectifyResult!=''">
-        and rectify_result like concat('%', #{rectifyResult}, '%')
+        and rectify_result =
+        (select dict_label from sys_dict_data where dict_type='bdyc_clqk' and dict_value=#{rectifyResult})
       </if>
       <if test="fileId!=null ">
         and file_id=#{fileId}

sql/dict-2023.sql

@@ -27,7 +27,12 @@ VALUES (7, '四平东运行工区', '7', 'dlyc_sygq', 'N', '0', 'admin', now());
 INSERT INTO `sys_dict_data`(`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `is_default`, `status`, `create_by`, `create_time`)
 VALUES (8, '德惠西运行工区', '8', 'dlyc_sygq', 'N', '0', 'admin', now());
 
-
+INSERT INTO `sys_dict_type`(`dict_name`, `dict_type`, `status`, `create_by`, `create_time`)
+VALUES ('变电异常信息处理情况', 'bdyc_clqk', '0', 'admin', now());
+INSERT INTO `sys_dict_data`(`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `is_default`, `status`, `create_by`, `create_time`)
+VALUES (1, '已处理', '1', 'bdyc_clqk', 'N', '0', 'admin', now());
+INSERT INTO `sys_dict_data`(`dict_sort`, `dict_label`, `dict_value`, `dict_type`, `is_default`, `status`, `create_by`, `create_time`)
+VALUES (0, '未处理', '0', 'bdyc_clqk', 'N', '0', 'admin', now());