From d723c256c765067a775b97946fcc699772f6bfee Mon Sep 17 00:00:00 2001 From: hxh Date: Wed, 10 Jul 2024 19:29:46 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=85=BB=E6=8A=A4=E8=AE=B0=E5=BD=95=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxgh/df/dto/DfYhRecordApprovalDto.java | 58 +++++++++++++++ .../kms/yxgh/df/mapper/DfYhRecordMapper.java | 7 ++ .../yxgh/df/service/DfYhRecordService.java | 19 ++++- .../resources/mapper/yxgh/DfYhPlanMapper.xml | 7 +- .../mapper/yxgh/DfYhRecordMapper.xml | 73 +++++++++++++++++++ 5 files changed, 158 insertions(+), 6 deletions(-) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordApprovalDto.java create mode 100644 shuili-system/src/main/resources/mapper/yxgh/DfYhRecordMapper.xml diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordApprovalDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordApprovalDto.java new file mode 100644 index 00000000..ff6c218d --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhRecordApprovalDto.java @@ -0,0 +1,58 @@ +package com.kms.yxgh.df.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.common.dto.OperatorDto; +import com.kms.yxgh.common.dto.SupplementDto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; +import java.util.List; + + +/** + * 堤防维修养护记录 + * + * @author sy + * @date 2023-11-20 + */ +@Data +@ApiModel("堤防维修养护记录验收列表") +public class DfYhRecordApprovalDto { + + @ApiModelProperty("养护记录id") + private String id; + + @ApiModelProperty("堤防代码") + private String dikeCode; + + @ApiModelProperty("堤防名称") + private String dikeName; + + @ApiModelProperty("堤防类型") + private Integer dikeType; + + @ApiModelProperty("维修养护类型") + private String type; + + @ApiModelProperty("计划代码") + private String planId; + + @ApiModelProperty("计划名称") + private String planName; + + @ApiModelProperty("资金") + private List supplements; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("完成时间") + private Date finishedTime; + + @ApiModelProperty("维修养护负责人") + private OperatorDto responsiblePerson; + + @ApiModelProperty("工程单位") + private String engineeringUnit; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java index 0f533f10..ff9078e9 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhRecordMapper.java @@ -2,7 +2,11 @@ package com.kms.yxgh.df.mapper; 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.common.dto.ApprovalDetailDto; +import com.kms.yxgh.common.dto.ApprovalSearchDto; import com.kms.yxgh.df.domain.DfYhRecord; +import com.kms.yxgh.df.dto.DfYhRecordApprovalDto; import com.kms.yxgh.df.dto.DfYhRecordDetailDto; import com.kms.yxgh.df.dto.DfYhRecordSearchDto; import org.apache.ibatis.annotations.Param; @@ -57,7 +61,10 @@ public interface DfYhRecordMapper extends BaseMapper { IPage searchPage(IPage page, @Param("searchDto") DfYhRecordSearchDto searchDto); + + @Select("SELECT MAX(create_time) FROM bs_sgc_df_yhjl WHERE dike_code = #{dikeCode} ") Date getLastInsertTimeByDikeCode(@Param("dikeCode") String dikeCode); + IPage> approvalSearchPage(Page page,@Param("dto") ApprovalSearchDto data); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java index c3f89edb..82320e1e 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java @@ -5,17 +5,21 @@ 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.system.service.SysUserService; import com.kms.yxgh.base.DfException; import com.kms.yxgh.base.enums.YhRecordStatus; import com.kms.yxgh.common.ApprovalStatusEnum; import com.kms.yxgh.common.dto.*; import com.kms.yxgh.common.service.ApprovalBusinessService; import com.kms.yxgh.df.domain.DfYhRecord; +import com.kms.yxgh.df.dto.DfYhPlanSearchDto; +import com.kms.yxgh.df.dto.DfYhRecordApprovalDto; import com.kms.yxgh.df.dto.DfYhRecordDetailDto; import com.kms.yxgh.df.dto.DfYhRecordSearchDto; import com.kms.yxgh.df.mapper.DfYhRecordMapper; import com.kms.yxgh.util.BeanCopyUtils; import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.core.domain.entity.SysUser; import com.shuili.common.core.service.BaseService; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -33,9 +37,10 @@ import java.util.Optional; */ @AllArgsConstructor @Service -public class DfYhRecordService extends BaseService implements ApprovalBusinessService { +public class DfYhRecordService extends BaseService implements ApprovalBusinessService { private final DfYhPlanService dfYhPlanService; + private final SysUserService sysUserService; public DfYhRecordDetailDto getDetailById(String id) { DfYhRecord record = this.getBaseMapper().selectById(id); @@ -120,12 +125,20 @@ public class DfYhRecordService extends BaseService } @Override - public IPage> approvalSearch(SearchParam> sp) { - return null; + public IPage> approvalSearch(SearchParam> sp) { + Page page = new Page<>(sp.getPageNum(), sp.getPageSize()); + return this.getBaseMapper().approvalSearchPage(page, sp.getData()); } @Override public List getOperatorList(String formId) { + SysUser user = sysUserService.getById("1"); + if (user != null) { + OperatorDto operatorDto = new OperatorDto(); + operatorDto.setUid(user.getId()); + operatorDto.setName(user.getNickName()); + return Collections.singletonList(operatorDto); + } return Collections.emptyList(); } diff --git a/shuili-system/src/main/resources/mapper/yxgh/DfYhPlanMapper.xml b/shuili-system/src/main/resources/mapper/yxgh/DfYhPlanMapper.xml index 5d6a2994..52a271cc 100644 --- a/shuili-system/src/main/resources/mapper/yxgh/DfYhPlanMapper.xml +++ b/shuili-system/src/main/resources/mapper/yxgh/DfYhPlanMapper.xml @@ -12,7 +12,7 @@ - + @@ -35,7 +35,8 @@ SELECT ts.id id, ts.form_id formId, ts.create_time submit_time, ts.approval_time approval_time, ts.status status, ts.operator operator, ts.comment comment, ts.doc ts_doc, - yh.dike_code dike_code, yh.dike_name dike_name, yh.name plan_name, yh.start_date start_date, yh.end_date + yh.id yh_id, yh.dike_code dike_code, yh.dike_name dike_name, yh.name plan_name, yh.start_date start_date, + yh.end_date end_date, yh.supplement supplement, yh.doc doc, yh.engineering_unit engineering_unit, yh.responsible_person responsible_person, @@ -46,7 +47,7 @@ LEFT JOIN att_dike_base jb ON yh.dike_code = jb.dike_code and jb.expr_date is null WHERE ts.business_type = #{dto.businessType} - + AND ts.status = #{dto.status} diff --git a/shuili-system/src/main/resources/mapper/yxgh/DfYhRecordMapper.xml b/shuili-system/src/main/resources/mapper/yxgh/DfYhRecordMapper.xml new file mode 100644 index 00000000..99ea1c2f --- /dev/null +++ b/shuili-system/src/main/resources/mapper/yxgh/DfYhRecordMapper.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file