From 0d0a4ca33a59bbef2cb388a8fa9f78f6b15f628e Mon Sep 17 00:00:00 2001 From: hxh Date: Sun, 16 Mar 2025 21:46:22 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=97=85=E9=99=A9tdsql=E6=94=B9?= =?UTF-8?q?=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/df/mapper/AttDikeBaseDfMapper.java | 29 +++++ .../business/df/domain/DfDangerousTask.java | 2 + .../mapper/DfDangerousTaskItemRelMapper.java | 13 +- .../df/mapper/DfDangerousTaskMapper.java | 121 ++---------------- .../df/service/DfDangerousTaskService.java | 4 +- 5 files changed, 48 insertions(+), 121 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/df/mapper/AttDikeBaseDfMapper.java b/shuili-system/src/main/java/com/kms/yxgh/base/df/mapper/AttDikeBaseDfMapper.java index c2f02b1f..91f5bae2 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/df/mapper/AttDikeBaseDfMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/df/mapper/AttDikeBaseDfMapper.java @@ -166,4 +166,33 @@ public interface AttDikeBaseDfMapper extends BaseMapper { many = @Many(select = "com.kms.yg.df.mapper.BsSgcDfFzrMapper.getByDikeCode")) }) IPage getDfCheckingLineProjectListWithPage(Page page, @Param("dto") DfCheckingLineSearchDto dto); + + @Select({ + "" + }) + @Results({ + @Result(property = "dikeCode", column = "dike_code"), + @Result(property = "dikeName", column = "dike_name"), + @Result(property = "dikeGrad", column = "dike_grad"), + @Result(property = "dikePatt", column = "dike_patt"), + }) + IPage selectByAqjdPage(Page page, @Param("dto") DfAqjdProjecDto dfProject); + } diff --git a/shuili-system/src/main/java/com/kms/yxgh/business/df/domain/DfDangerousTask.java b/shuili-system/src/main/java/com/kms/yxgh/business/df/domain/DfDangerousTask.java index c3178955..b2285c90 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/business/df/domain/DfDangerousTask.java +++ b/shuili-system/src/main/java/com/kms/yxgh/business/df/domain/DfDangerousTask.java @@ -1,5 +1,6 @@ package com.kms.yxgh.business.df.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.kms.yxgh.business.common.SyBaseEntity; @@ -27,6 +28,7 @@ public class DfDangerousTask extends SyBaseEntity { * 名称 */ @ApiModelProperty("名称") + @TableField("task_name") private String name; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/business/df/mapper/DfDangerousTaskItemRelMapper.java b/shuili-system/src/main/java/com/kms/yxgh/business/df/mapper/DfDangerousTaskItemRelMapper.java index 2a78178f..0c8e7d8a 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/business/df/mapper/DfDangerousTaskItemRelMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/business/df/mapper/DfDangerousTaskItemRelMapper.java @@ -44,24 +44,13 @@ public interface DfDangerousTaskItemRelMapper extends BaseMapper" + "LEFT JOIN sys_xzqh xzqh on xzqh.xzqhdm=#{dto.adcdStart} " + "" + - "WHERE xx.expr_date is null " + - "" + - "AND xx.dike_type = #{dto.dikeType} " + - "" + + "WHERE 1=1 " + "" + "AND rw.id = #{dto.id} " + "" + - "" + - "AND xx.DIKE_RIVER = #{dto.riverLocation} " + - "" + - "" + - "AND (xx.ADCD_START = #{dto.adcdStart} OR xx.ADCD_START in (SELECT xzqhdm from sys_xzqh where parentid =#{dto.adcdStart}) " + - " or xx.ADCD_START in (select xzqhdm from sys_xzqh where parentid in(SELECT xzqhdm from sys_xzqh where parentid = #{dto.adcdStart}))) " + - "" + "") DfDangerousTotalDto selectProblemCountByTask(@Param("dto") DfDangerousTaskSearchDto dto); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/business/df/mapper/DfDangerousTaskMapper.java b/shuili-system/src/main/java/com/kms/yxgh/business/df/mapper/DfDangerousTaskMapper.java index faee3282..1e804c0d 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/business/df/mapper/DfDangerousTaskMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/business/df/mapper/DfDangerousTaskMapper.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yxgh.business.df.domain.DfDangerousTask; -import com.kms.yxgh.business.df.dto.DfAqjdProjecDto; import com.kms.yxgh.business.df.dto.DfDangerousTaskDto; import com.kms.yxgh.business.df.dto.DfDangerousTaskSearchDto; import com.kms.yxgh.business.df.dto.DfDangerousTotalDto; @@ -23,32 +22,13 @@ import java.util.Date; public interface DfDangerousTaskMapper extends BaseMapper { @Select("") DfDangerousTaskDto selectByIdDetail(@Param("id") String id); - @Select({ - "" - }) - @Results({ - @Result(property = "dikeCode", column = "dike_code"), - @Result(property = "dikeName", column = "dike_name"), - @Result(property = "dikeGrad", column = "dike_grad"), - @Result(property = "dikePatt", column = "dike_patt"), - @Result(property = "engineeringManagementUnit", column = "engineering_management_unit"), - @Result(property = "identifyTime", column = "identify_time"), - @Result(property = "securityCategory", column = "security_category"), - @Result(property = "safetyAppraisalOpinion", column = "safety_appraisal_opinion"), - @Result(property = "lastTime", column = "dike_code", javaType = Date.class, one = @One(select = "com.kms.yxgh.business.df.mapper.DfRecordMapper.getLastInsertTimeByDikeCode")) - }) - IPage selectByAqjdPage(Page page, @Param("dto") DfAqjdProjecDto dfProject); - - @Select("") DfDangerousTotalDto selectCountByTask(@Param("dto") DfDangerousTaskSearchDto dto); @Select("") DfDangerousTotalDto selectCountByTaskTotal(@Param("dto") DfDangerousTaskSearchDto dto); diff --git a/shuili-system/src/main/java/com/kms/yxgh/business/df/service/DfDangerousTaskService.java b/shuili-system/src/main/java/com/kms/yxgh/business/df/service/DfDangerousTaskService.java index a333c999..72e64636 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/business/df/service/DfDangerousTaskService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/business/df/service/DfDangerousTaskService.java @@ -4,6 +4,7 @@ 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.df.mapper.AttDikeBaseDfMapper; import com.kms.yxgh.business.common.SzException; import com.kms.yxgh.business.common.enums.SuperviseEngineeringStatus; import com.kms.yxgh.business.common.service.SyServiceImpl; @@ -34,6 +35,7 @@ import java.util.stream.Collectors; public class DfDangerousTaskService extends SyServiceImpl { private final DfDangerousTaskItemRelMapper taskItemRelMapper; + private final AttDikeBaseDfMapper attDikeBaseDfMapper; public IPage getListByPage(SearchParam sp) { Page page = new Page<>(sp.getPageNum(), sp.getPageSize()); @@ -42,7 +44,7 @@ public class DfDangerousTaskService extends SyServiceImpl getAqjdListByPage(SearchParam sp) { Page page = new Page<>(sp.getPageNum(), sp.getPageSize()); - return this.getBaseMapper().selectByAqjdPage(page, sp.getData()); + return attDikeBaseDfMapper.selectByAqjdPage(page, sp.getData()); } @Transactional(rollbackFor = Exception.class)