From 93d5550ab9319a8c5c14cb0fc68ce9bb954e1088 Mon Sep 17 00:00:00 2001
From: huangrenya <hry1204@153.com>
Date: Sat, 9 Mar 2024 13:38:19 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=B0=B4?=
 =?UTF-8?q?=E9=97=B8/=E5=A0=A4=E9=98=B2=E6=9F=A5=E8=AF=A2=E5=A0=A4?=
 =?UTF-8?q?=E9=98=B2=E7=BB=B4=E4=BF=AE=E5=85=BB=E6=8A=A4=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/kms/yxgh/df/dto/DfYhRecordDetailDto.java | 3 +++
 .../src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java | 1 +
 .../src/main/java/com/kms/yxgh/sz/mapper/SzYhRecordMapper.java | 1 +
 3 files changed, 5 insertions(+)

diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordDetailDto.java
index 07f3cdea..4614338a 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordDetailDto.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordDetailDto.java
@@ -25,6 +25,9 @@ public class DfYhRecordDetailDto {
     @ApiModelProperty("堤防编码")
     private String dikeCode;
 
+    @ApiModelProperty("堤防名称")
+    private String dikeName;
+
     @ApiModelProperty("计划代码")
     private String planId;
 
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 85434085..0f533f10 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
@@ -27,6 +27,7 @@ public interface DfYhRecordMapper extends BaseMapper<DfYhRecord> {
             "FROM bs_sgc_df_yhjl yhjl " +
             "LEFT JOIN bs_sgc_df_gcda df ON yhjl.dike_code = df.dike_code " +
             "WHERE 1=1 " +
+            "and df.expr_date is null " +
             "<if test='searchDto.dikeCode != null '>" +
             "AND yhjl.dike_code = #{searchDto.dikeCode} " +
             "</if>" +
diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhRecordMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhRecordMapper.java
index 0b6c0552..84010b8e 100644
--- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhRecordMapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzYhRecordMapper.java
@@ -40,6 +40,7 @@ public interface SzYhRecordMapper extends BaseMapper<SzYhRecord> {
             "FROM bs_sgc_sz_yhjl yhjl " +
             "LEFT JOIN bs_sgc_sz_jbxx jbxx ON yhjl.waga_code = jbxx.waga_code " + // 使用LEFT JOIN连接基本信息表
             "WHERE 1=1 " +
+            "and jbxx.expr_date is null " +
             "<if test='searchDto.startCreatedTime != null'>" +
             "AND yhjl.create_time &gt;= #{searchDto.startCreatedTime} " +
             "</if>" +