feat: 调整堤害防治记录查询接口

shuili-system/src/main/java/com/kms/yxgh/df/controller/DfAnimalRecordController.java

@@ -33,8 +33,8 @@ public class DfAnimalRecordController {
      */
     @PostMapping("/list")
     @ApiOperation("堤害动物防治记录列表")
-    public IPage<DfAnimalRecord> list(@RequestBody SearchParam<DfAnimalRecord> sp) {
-        return dfRecordService.selectPage(sp);
+    public IPage<DfAnimalRecordDto> list(@RequestBody SearchParam<DfAnimalRecordDto> sp) {
+        return dfRecordService.search(sp);
     }
 
 

shuili-system/src/main/java/com/kms/yxgh/df/domain/DfAnimalRecord.java

@@ -21,6 +21,9 @@ import lombok.Data;
 public class DfAnimalRecord extends SyBaseEntity {
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty("堤防编码")
+    private String dikeCode;
+
     /**
      * 计划代码
      */

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

@@ -17,6 +17,9 @@ public class DfAnimalRecordDto {
 
     @ApiModelProperty(name = "id")
     private String id;
+
+    @ApiModelProperty("堤防编码")
+    private String dikeCode;
     /**
      * 计划代码
      */

shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfAnimalRecordMapper.java

@@ -1,9 +1,19 @@
 package com.kms.yxgh.df.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.yxgh.df.domain.DfAnimalRecord;
+import com.kms.yxgh.df.dto.DfAnimalRecordDto;
+import com.kms.yxgh.df.dto.DfYhPlanDto;
+import com.shuili.common.utils.StringUtils;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.SelectProvider;
+import org.apache.ibatis.jdbc.SQL;
 import org.springframework.stereotype.Repository;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.Map;
+
 /**
  * 害堤动物防治计划执行记录Mapper接口
  *
@@ -13,4 +23,30 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 @Repository
 public interface DfAnimalRecordMapper extends BaseMapper<DfAnimalRecord> {
 
+    @SelectProvider(type = DfAnimalRecordSqlProvider.class, method = "selectPage")
+    IPage<DfAnimalRecordDto> selectPage(Page<DfAnimalRecordDto> page, @Param("dto") DfAnimalRecordDto dto);
+
+     class DfAnimalRecordSqlProvider {
+
+        public String selectPage(final Map<String, Object> param) {
+            return new SQL(){{
+                SELECT("t.id, t.dike_code, t.plan_id, t.plan_name, t.location, t.construction_status, t.pest, t.status");
+                FROM("bs_sgc_df_hdjl t");
+                WHERE("1 = 1");
+
+                DfAnimalRecordDto dto = (DfAnimalRecordDto) param.get("dto");
+                if (dto != null) {
+                    if (StringUtils.isNotBlank(dto.getDikeCode())) {
+                        WHERE("t.dike_code = #{dto.dikeCode}");
+                    }
+                    if (dto.getLocation() != null) {
+                        WHERE("t.location LIKE CONCAT('%', #{dto.location}, '%')");
+                    }
+                    if (dto.getStatus() != null) {
+                        WHERE("t.status = #{dto.status}");
+                    }
+                }
+            }}.toString();
+        }
+    }
 }

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

@@ -2,18 +2,22 @@ package com.kms.yxgh.df.service;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kms.yxgh.base.DfException;
 import com.kms.yxgh.base.enums.DfAnimalRecordStatus;
 import com.kms.yxgh.df.domain.DfAnimalDrug;
 import com.kms.yxgh.df.domain.DfAnimalRecord;
 import com.kms.yxgh.df.domain.DfRecordImage;
 import com.kms.yxgh.df.dto.DfAnimalRecordDto;
+import com.kms.yxgh.df.dto.DfYhPlanDto;
 import com.kms.yxgh.df.mapper.DfAnimalDrugMapper;
 import com.kms.yxgh.df.mapper.DfAnimalRecordMapper;
 import com.kms.yxgh.df.mapper.DfRecordImageMapper;
 import com.kms.yxgh.util.BeanCopyUtils;
 import com.kms.yxgh.util.StreamUtils;
+import com.shuili.common.core.domain.SearchParam;
 import com.shuili.common.core.service.BaseService;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -170,4 +174,8 @@ public class DfAnimalRecordService extends BaseService<DfAnimalRecordMapper, DfA
         return count > 0;
     }
 
+    public IPage<DfAnimalRecordDto> search(SearchParam<DfAnimalRecordDto> sp) {
+        Page<DfAnimalRecordDto> page = new Page<>(sp.getPageNum(), sp.getPageSize());
+        return this.getBaseMapper().selectPage(page, sp.getData());
+    }
 }

sql/sy/v1.2.0/全量脚本/v1.2.0-all.sql

@@ -225,6 +225,7 @@ CREATE TABLE `bs_sgc_df_hdjhzx` (
 
 CREATE TABLE `bs_sgc_df_hdjl` (
   `ID` int NOT NULL AUTO_INCREMENT COMMENT '害堤动物防治计划执行记录编号',
+  `DIKE_CODE` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '堤防编码',
   `PLAN_ID` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '计划代码',
   `PLAN_NAME` varchar(50) COLLATE utf8mb4_general_ci NOT NULL COMMENT '计划名称',
   `LOCATION` int COLLATE utf8mb4_general_ci COMMENT '施工地点',

sql/sy/v1.2.0/增量脚本/v1.2.0-update.sql

@@ -1,6 +1,8 @@
 SET NAMES utf8mb4;
 ALTER TABLE `bs_sgc_df_xsjhjl` ADD  `DIKE_CODE` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '堤防代码';
 ALTER TABLE `bs_sgc_df_xsjh` ADD  `DIKE_CODE` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '堤防代码';
+ALTER TABLE `bs_sgc_df_hdjl` ADD  `DIKE_CODE` varchar(18) COLLATE utf8mb4_general_ci NOT NULL COMMENT '堤防代码';
+
 ALTER TABLE `bs_sgc_df_xsjhjlz` ADD  `DOC` text COLLATE utf8mb4_general_ci NOT NULL COMMENT '文档';
 ALTER TABLE `bs_sgc_sz_xsjhjlz` ADD  `DOC` text COLLATE utf8mb4_general_ci NOT NULL COMMENT '文档';