From 1f2b10f1a4bfaec96d4c25b905d317ca34bcf6e5 Mon Sep 17 00:00:00 2001
From: hxh <hxh@datametatech.com>
Date: Fri, 12 Jul 2024 10:59:06 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/kms/yxgh/df/dto/DfYhPlanSearchDto.java   | 3 +++
 .../src/main/java/com/kms/yxgh/df/dto/DfYhRecordSearchDto.java | 3 +++
 .../src/main/java/com/kms/yxgh/df/mapper/DfYhPlanMapper.java   | 3 +++
 .../src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhPlanSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhPlanSearchDto.java
index d5e71c94..cae883ab 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhPlanSearchDto.java
+++ b/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;
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordSearchDto.java
index 1764754f..f96c7d0d 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordSearchDto.java
+++ b/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;
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhPlanMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhPlanMapper.java
index cb3bbce5..b6f874f4 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhPlanMapper.java
+++ b/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>"
     })
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java
index b01501d6..1039007a 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java
+++ b/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({