fix: 限定dikeCode/wagaCode

shuili-system/src/main/java/com/kms/yg/df/mapper/BsSgcDfJbxxMapper.java

@@ -92,6 +92,9 @@ public interface BsSgcDfJbxxMapper extends BaseMapper<BsSgcDfJbxx> {
             "left join bs_sgc_df_gcgl pj on pj.dike_code = df.dike_code and pj.expr_date is null ",
             "where 1=1 ",
             "and df.expr_date is null ",
+            "<if test='dikeCode != null  and dikeCode != \"\"'>",
+            "and dike_code = #{dikeCode} ",
+            "</if>",
             "<if test='sp.dikeName != null  and sp.dikeName != \"\"'>",
             "and dike_name like concat('%', #{sp.dikeName}, '%') ",
             "</if>",
@@ -118,6 +121,9 @@ public interface BsSgcDfJbxxMapper extends BaseMapper<BsSgcDfJbxx> {
             "LEFT JOIN bs_sgc_df_gcgl gcgl ON gcgl.dike_code = df.dike_code  and gcgl.expr_date is null " +
             "WHERE 1=1 " +
             "AND df.expr_date is null " +
+            "<if test='dfProject.dikeCode != null and dfProject.dikeCode != \"\"'>" +
+            "AND df.dike_code = #{dfProject.dikeCode} " +
+            "</if>" +
             "<if test='dfProject.dikeGrad != null and dfProject.dikeGrad != \"\"'>" +
             "AND df.dike_grad = #{dfProject.dikeGrad} " +
             "</if>" +

shuili-system/src/main/java/com/kms/yg/sz/mapper/BsSgcSzGcdaMapper.java

@@ -63,6 +63,9 @@ public interface BsSgcSzGcdaMapper extends BaseMapper<BsSgcSzGcda> {
             "left join bs_sgc_sz_gcgl pj on pj.waga_code = df.waga_code and df.expr_date is null and pj.expr_date is null ",
             "where 1=1 ",
             "and df.expr_date is null ",
+            "<if test='wagaCode != null  and wagaCode != \"\"'>",
+            "and waga_code = #{wagaCode} ",
+            "</if>",
             "<if test='sp.wagaName != null  and sp.wagaName != \"\"'>",
             "and waga_name like concat('%', #{sp.wagaName}, '%') ",
             "</if>",
@@ -89,6 +92,9 @@ public interface BsSgcSzGcdaMapper extends BaseMapper<BsSgcSzGcda> {
             "LEFT JOIN bs_sgc_sz_gcgl pj ON pj.waga_code = df.waga_code and pj.expr_date is null " +
             "WHERE 1=1 " +
             "and df.expr_date is null  " +
+            "<if test='szProject.wagaCode != null and szProject.wagaCode != \"\"'>" +
+            "AND df.waga_code = #{szProject.wagaCode} " +
+            "</if>" +
             "<if test='szProject.wagaName != null and szProject.wagaName != \"\"'>" +
             "AND df.waga_name like concat('%', #{szProject.wagaName}, '%') " +
             "</if>" +

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

@@ -1,6 +1,7 @@
 package com.kms.yxgh.df.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,6 +17,7 @@ import java.util.Date;
  */
 
 @Data
+@ApiModel("堤防维修养护计划查询条件")
 public class DfYhPlanDto {
 
     @ApiModelProperty("id")

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

@@ -17,6 +17,8 @@ import lombok.Data;
 @ApiModel(value = "DfYhProjectQueDto", description = "堤防维修养护工程查询参数")
 public class DfYhProjectQueDto {
 
+    @ApiModelProperty(value = "堤防代码")
+    private String dikeCode;
     @ApiModelProperty(value = "堤防名称")
     private String dikeName;
     @ApiModelProperty(value = "工程管理单位")

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

@@ -16,6 +16,8 @@ import lombok.Data;
 @ApiModel("堤防水雨情工程查询参数")
 @Data
 public class DfYqProjectQueDto {
+    @ApiModelProperty(value = "堤防代码")
+    private String dikeCode;
 
     @ApiModelProperty(value = "堤防级别")
     private String dikeGrad;

shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYhProjectQueDto.java

@@ -17,6 +17,8 @@ import lombok.Data;
 @ApiModel(value = "SzYhProjectQueDto", description = "水闸维修养护工程查询参数")
 public class SzYhProjectQueDto {
 
+    @ApiModelProperty(value = "水闸代码")
+    private String wagaCode;
     @ApiModelProperty(value = "水闸名称")
     private String wagaName;
     @ApiModelProperty(value = "工程管理单位")

shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzYqProjectQueDto.java

@@ -17,6 +17,8 @@ import lombok.Data;
 @ApiModel(value = "SzYqProjectQueDto", description = "水闸水雨情工程查询参数")
 public class SzYqProjectQueDto {
 
+    @ApiModelProperty(value = "水闸代码")
+    private String wagaCode;
     @ApiModelProperty(value = "水闸名称")
     private String wagaName;
     @ApiModelProperty(value = "行政规划")