From f07c3c091e3fd8e999ff0cdaafa305c3fee6be8c Mon Sep 17 00:00:00 2001 From: huangrenya Date: Wed, 20 Mar 2024 11:13:25 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E7=97=85=E9=99=A9=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B-=E6=B0=B4=E9=97=B8/=E5=A0=A4=E9=98=B2-=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=85=B3=E8=81=94=E6=9F=A5=E8=AF=A2=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E5=AE=89=E5=85=A8=E9=89=B4=E5=AE=9A=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DfDangerousTaskController.java | 11 ++++++ .../com/kms/yxgh/df/dto/DfAqjdProjecDto.java | 29 +++++++++++++++ .../yxgh/df/mapper/DfDangerousTaskMapper.java | 35 +++++++++++++++++- .../df/service/DfDangerousTaskService.java | 5 +++ .../controller/SzDangerousTaskController.java | 13 +++++++ .../com/kms/yxgh/sz/dto/SzAqjdProjecDto.java | 31 ++++++++++++++++ .../yxgh/sz/mapper/SzDangerousTaskMapper.java | 37 ++++++++++++++++++- .../sz/service/SzDangerousTaskService.java | 5 +++ 8 files changed, 162 insertions(+), 4 deletions(-) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/dto/DfAqjdProjecDto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzAqjdProjecDto.java diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfDangerousTaskController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfDangerousTaskController.java index 653b61cf..0787f066 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfDangerousTaskController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfDangerousTaskController.java @@ -36,6 +36,17 @@ public class DfDangerousTaskController { return Response.ok(dangerousTaskService.getListByPage(sp)); } + /** + * 查询堤防关联的安全鉴定列表 + * @param sp + * @return + */ + @ApiOperation("堤防关联的安全鉴定列表") + @PostMapping("/salePage") + public Response> salePage(@RequestBody SearchParam sp) { + return Response.ok(dangerousTaskService.getAqjdListByPage(sp)); + } + /** * 查询堤防病险工程核查任务详情 * @param id diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfAqjdProjecDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfAqjdProjecDto.java new file mode 100644 index 00000000..783065ca --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfAqjdProjecDto.java @@ -0,0 +1,29 @@ +package com.kms.yxgh.df.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.shuili.common.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 包含安全鉴定检测等属性。 + */ +@Data +public class DfAqjdProjecDto extends DfProjectListDto { + + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty("鉴定日期") + private Date identifyTime; + + /** 安全类别 */ + @Excel(name = "安全类别") + @ApiModelProperty("安全类别") + private String securityCategory; + + /** 安全鉴定意见 */ + @ApiModelProperty("安全鉴定意见") + private String safetyAppraisalOpinion; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousTaskMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousTaskMapper.java index 172f21bd..996d16e3 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousTaskMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousTaskMapper.java @@ -4,13 +4,14 @@ 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.df.domain.DfDangerousTask; +import com.kms.yxgh.df.dto.DfAqjdProjecDto; import com.kms.yxgh.df.dto.DfDangerousTaskDto; import com.kms.yxgh.df.dto.DfDangerousTaskSearchDto; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.*; import org.springframework.stereotype.Repository; import java.io.Serializable; +import java.util.Date; /** * 堤防病险工程任务Mapper接口 @@ -70,4 +71,34 @@ public interface DfDangerousTaskMapper extends BaseMapper { "" + "") DfDangerousTaskDto selectByIdDetail(Serializable id); + + @Select({ + "" + }) + @Results({ + @Result(property = "dikeCode", column = "dike_code"), + @Result(property = "dikeName", column = "dike_name"), + @Result(property = "engineeringManagementUnit", column = "engineering_management_unit"), + @Result(property = "waterAdministrativeDepartment", column = "water_administrative_department"), + @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.df.mapper.DfRecordMapper.getLastInsertTimeByDikeCode")) + }) + IPage selectByAqjdPage(Page page, @Param("dto") DfAqjdProjecDto dfProject); + + } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousTaskService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousTaskService.java index ee8166b3..b5289826 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousTaskService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousTaskService.java @@ -37,6 +37,11 @@ public class DfDangerousTaskService extends BaseService getAqjdListByPage(SearchParam sp) { + Page page = new Page<>(sp.getPageNum(), sp.getPageSize()); + return this.getBaseMapper().selectByAqjdPage(page, sp.getData()); + } + @Transactional(rollbackFor = Exception.class) public DfDangerousTaskDto add(DfDangerousTaskDto dto) { DfDangerousTask dfDangerousTask = BeanCopyUtils.copy(dto, DfDangerousTask.class); diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzDangerousTaskController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzDangerousTaskController.java index 4b9f40fd..97179805 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzDangerousTaskController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzDangerousTaskController.java @@ -36,6 +36,19 @@ public class SzDangerousTaskController { return Response.ok(dangerousTaskService.getListByPage(sp)); } + /** + * 查询水闸关联的安全鉴定列表 + * @param sp + * @return + */ + @ApiOperation("水闸关联的安全鉴定列表") + @PostMapping("/salePage") + public Response> salePage(@RequestBody SearchParam sp) { + return Response.ok(dangerousTaskService.getAqjdListByPage(sp)); + } + + + /** * 查询水闸病险工程核查任务详情 * @param id diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzAqjdProjecDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzAqjdProjecDto.java new file mode 100644 index 00000000..05c123ef --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzAqjdProjecDto.java @@ -0,0 +1,31 @@ +package com.kms.yxgh.sz.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.df.dto.DfProjectListDto; +import com.shuili.common.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + + +/** + * 包含安全鉴定检测等属性。 + */ +@Data +public class SzAqjdProjecDto extends DfProjectListDto { + + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty("鉴定日期") + private Date identifyTime; + + /** 安全类别 */ + @Excel(name = "安全类别") + @ApiModelProperty("安全类别") + private String securityCategory; + + /** 安全鉴定意见 */ + @ApiModelProperty("安全鉴定意见") + private String safetyAppraisalOpinion; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousTaskMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousTaskMapper.java index ce316a26..76d925ed 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousTaskMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousTaskMapper.java @@ -4,13 +4,14 @@ 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.sz.domain.SzDangerousTask; +import com.kms.yxgh.sz.dto.SzAqjdProjecDto; import com.kms.yxgh.sz.dto.SzDangerousTaskDto; import com.kms.yxgh.sz.dto.SzDangerousTaskSearchDto; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.*; import org.springframework.stereotype.Repository; import java.io.Serializable; +import java.util.Date; /** * 水闸病险工程任务Mapper接口 @@ -67,4 +68,36 @@ public interface SzDangerousTaskMapper extends BaseMapper { "" + "") SzDangerousTaskDto selectByIdDetail(Serializable id); + + @Select({ + "" + }) + @Results({ + @Result(property = "wagaCode", column = "waga_code"), + @Result(property = "wagaName", column = "waga_name"), + @Result(property = "engineeringManagementUnit", column = "engineering_management_unit"), + @Result(property = "waterAdministrativeDepartment", column = "water_administrative_department"), + @Result(property = "identifyTime", column = "identify_time"), + @Result(property = "securityCategory", column = "security_category"), + @Result(property = "safetyAppraisalOpinion", column = "safety_appraisal_opinion"), + @Result(property = "lastTime", column = "waga_code", javaType = Date.class, one = @One(select = "com.kms.yxgh.sz.mapper.SzRecordMapper.getLastInsertTimeByWagaCodeAndPlanId")) + }) + IPage selectByAqjdPage(Page page, @Param("dto") SzAqjdProjecDto dto); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzDangerousTaskService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzDangerousTaskService.java index 22a8a1fb..1dec9f91 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzDangerousTaskService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzDangerousTaskService.java @@ -37,6 +37,11 @@ public class SzDangerousTaskService extends BaseService getAqjdListByPage(SearchParam sp) { + Page page = new Page<>(sp.getPageNum(), sp.getPageSize()); + return this.getBaseMapper().selectByAqjdPage(page, sp.getData()); + } + @Transactional(rollbackFor = Exception.class) public SzDangerousTaskDto add(SzDangerousTaskDto dto) { SzDangerousTask dangerousTask = BeanCopyUtils.copy(dto, SzDangerousTask.class);