From 732909bf831769f992a467e2a7927f034cf42dd0 Mon Sep 17 00:00:00 2001
From: hxh <hxh@datametatech.com>
Date: Thu, 18 Jul 2024 19:07:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E8=A1=8C=E6=94=BF?=
 =?UTF-8?q?=E5=8C=BA=E5=88=92=E6=A3=80=E7=B4=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/kms/yg/df/mapper/BsSgcDfSafeJbxxMapper.java     | 4 ++--
 .../src/main/java/com/kms/yxgh/df/dto/DfPlanSearchDto.java   | 5 ++++-
 .../src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java   | 3 +++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSafeJbxxMapper.java b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSafeJbxxMapper.java
index cae5b5c4..d95946dc 100644
--- a/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSafeJbxxMapper.java
+++ b/shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfSafeJbxxMapper.java
@@ -170,8 +170,8 @@ public interface BsSgcDfSafeJbxxMapper extends BaseMapper<BsSgcDfSafeJbxx> {
             "<if test='dto.dikeType != null and dto.dikeType != \"\"'>",
             "and df.dike_type = #{dto.dikeType} ",
             "</if>",
-            "<if test='dto.adcd != null and dto.adcd != \"\"'>",
-            "and df.adcd like concat(#{dto.adcd}, '%') ",
+            "<if test='dto.adcdQx != null and dto.adcdQx != \"\"'>",
+            "and df.adcd like concat(#{dto.adcdQx}, '%') ",
             "</if>",
             "and EXISTS (SELECT 1 FROM bs_sgc_df_xslx line WHERE line.dike_code = df.dike_code ",
             "<if test='dto.lineName != null and dto.lineName != \"\"'>",
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanSearchDto.java
index e867db1d..3da4a261 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanSearchDto.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPlanSearchDto.java
@@ -1,5 +1,6 @@
 package com.kms.yxgh.df.dto;
 
+import com.kms.yxgh.common.dto.IAdcd;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -9,7 +10,7 @@ import java.util.List;
 
 @Data
 @ApiModel(value = "堤防巡视检查计划查询")
-public class DfPlanSearchDto {
+public class DfPlanSearchDto implements IAdcd {
 
     @ApiModelProperty(value = "堤防编号")
     private String dikeCode;
@@ -26,4 +27,6 @@ public class DfPlanSearchDto {
     private Date startTime;
     @ApiModelProperty(value = "结束时间")
     private Date endTime;
+    @ApiModelProperty(value = "行政区划")
+    private String adcd;
 }
diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java
index b8f71ea4..9ee017c4 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfPlanMapper.java
@@ -53,6 +53,9 @@ public interface DfPlanMapper extends BaseMapper<DfPlan> {
             "<if test='dto != null and dto.endTime != null'>" +
             "AND p.end_date &lt;= #{dto.endTime} " +
             "</if>" +
+            "<if test='dto != null and dto.adcdQx != null and dto.adcdQx != \"\"'>" +
+            "AND df.adcd like concat(#{dto.adcdQx}, '%') " +
+            "</if>" +
             "<if test='dto != null and dto.recordStatus != null and dto.recordStatus == \"0\"'>" +
             " and NOT EXISTS (" +
             "    SELECT plan_id FROM bs_sgc_df_xsjhjl od WHERE  p.id = od.plan_id and od.create_uid =  #{dto.user} and od.status = '1'" +