feat: 添加状态查询条件

shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhPlanSearchDto.java

@@ -41,6 +41,9 @@ public class DfYhPlanSearchDto {
     @ApiModelProperty("名称")
     private String name;
 
+    @ApiModelProperty("状态")
+    private String status;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("计划开始时间")
     private Date startDate;

shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordSearchDto.java

@@ -38,6 +38,9 @@ public class DfYhRecordSearchDto {
     @ApiModelProperty("名称")
     private String name;
 
+    @ApiModelProperty("状态")
+    private String status;
+
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("计划开始时间")
     private Date startDate;

shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhPlanMapper.java

@@ -55,6 +55,9 @@ public interface DfYhPlanMapper extends BaseMapper<DfYhPlan> {
             "<if test='dto.endDate != null'>",
             "AND yh.end_date &lt;= #{dto.endDate} ",
             "</if>",
+            "<if test='dto.status != null and dto.status != \"\"'>",
+            "AND yh.status = #{dto.status} ",
+            "</if>",
             "ORDER BY yh.create_time DESC",
             "</script>"
     })

shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java

@@ -58,6 +58,9 @@ public interface DfYhRecordMapper extends BaseMapper<DfYhRecord> {
             "<if test='searchDto.adcd != null and searchDto.adcd != \"\"'>" +
             "AND df.adcd LIKE CONCAT(#{searchDto.adcd},'%') " +
             "</if>" +
+            "<if test='searchDto.status != null and searchDto.status != \"\"'>" +
+            "AND yhjl.status = #{searchDto.status} " +
+            "</if>" +
             "ORDER BY yhjl.create_time DESC" +
             "</script>")
     @Results({