fix: 堤防工程添加行政区域查询条件

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

@@ -28,11 +28,20 @@ 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='dikeName != null  and dikeName != \"\"'>",
-            "and dike_name like concat('%', #{dikeName}, '%') ",
+            "<if test='dto.dikeName != null  and dto.dikeName != \"\"'>",
+            "and dike_name like concat('%', #{dto.dikeName}, '%') ",
             "</if>",
-            "<if test='dikeType != null and dikeType != \"\"'>",
-            "and dike_type = #{dikeType} ",
+            "<if test='dto.dikeType != null and dto.dikeType != \"\"'>",
+            "and dike_type = #{dto.dikeType} ",
+            "</if>",
+            "<if test='dto.adcd != null and dto.adcd != \"\"'>",
+            "and adcd = #{dto.adcd} ",
+            "</if>",
+            "<if test='dto.adcdStart != null and dto.adcdStart != \"\"'>",
+            "and adcd_start = #{dto.adcdStart} ",
+            "</if>",
+            "<if test='dto.adcdEnd != null and dto.adcdEnd != \"\"'>",
+            "and adcd_end = #{dto.adcdEnd} ",
             "</if>",
             "</script>"
     })
@@ -43,7 +52,7 @@ public interface BsSgcDfJbxxMapper extends BaseMapper<BsSgcDfJbxx> {
             @Result(property = "waterAdministrativeDepartment", column = "water_administrative_department"),
             @Result(property = "lastTime", column = "dike_code", javaType = Date.class, one = @One(select = "com.kms.yxgh.df.mapper.DfRecordMapper.getLastInsertTimeByDikeCode"))
     })
-    IPage<DfProjectListDto> getDfProjectListWithPage(Page<DfProjectListDto> page, @Param("dikeName") String dikeName, @Param("dikeType") String dikeType);
+    IPage<DfProjectListDto> getDfProjectListWithPage(Page<DfProjectListDto> page, @Param("dto") BsSgcDfJbxx dfProject);
 
     @Select({
             "<script>",

shuili-system/src/main/java/com/kms/yxgh/df/service/DfProjectService.java

@@ -38,14 +38,10 @@ public class DfProjectService {
 
     public IPage<DfProjectListDto> getProjectList(SearchParam<BsSgcDfJbxx> sp) {
         Page<DfProjectListDto> page = new Page<>(sp.getPageNum(), sp.getPageSize());
-        String dikeName = null;
-        String dikeType = null;
-        BsSgcDfJbxx dfProject = sp.getData();
-        if (dfProject != null) {
-            dikeType = dfProject.getDikeType();
-            dikeName = dfProject.getDikeName();
-        }
-        return dfProjectMapper.getDfProjectListWithPage(page, dikeName, dikeType);
+
+        BsSgcDfJbxx dfProject = Optional.ofNullable(sp.getData()).orElseGet(BsSgcDfJbxx::new);
+
+        return dfProjectMapper.getDfProjectListWithPage(page, dfProject);
     }
 
     @Transactional(rollbackFor = Exception.class)