Merge remote-tracking branch 'origin/release-sy-v1.0.0' into release-sy-v1.0.0

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;
 

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>" +

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>" +