diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contract/ContractController.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contract/ContractController.java index c6bda3ffa..506ecd6de 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contract/ContractController.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contract/ContractController.java @@ -71,8 +71,8 @@ public class ContractController { @GetMapping("/page") @Operation(summary = "获得合同分页") @PreAuthorize("@ss.hasPermission('cms:contract:query')") - public CommonResult> getContractPage(@Valid ContractPageReqVO pageReqVO) { - PageResult pageResult = contractService.getContractPage(pageReqVO); + public CommonResult> getContractPage(@Valid ContractPageReqVO pageReqVO) { + PageResult pageResult = contractService.getContractPage(pageReqVO); return success(pageResult); } @@ -83,7 +83,7 @@ public class ContractController { public void exportContractExcel(@Valid ContractPageReqVO pageReqVO, HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = contractService.getContractPage(pageReqVO).getList(); + List list = contractService.getContractPage(pageReqVO).getList(); // 导出 Excel ExcelUtils.write(response, "合同.xls", "数据", ContractRespVO.class, BeanUtils.toBean(list, ContractRespVO.class)); diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contract/vo/ContractPageReqVO.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contract/vo/ContractPageReqVO.java index ef9b8ff1f..133675503 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contract/vo/ContractPageReqVO.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/contract/vo/ContractPageReqVO.java @@ -17,7 +17,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_ public class ContractPageReqVO extends PageParam { - @Schema(description = "合同编号", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "项目编号", requiredMode = Schema.RequiredMode.REQUIRED) private Long projectId; @Schema(description = "合同名称", example = "芋艿") diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/dataobject/contract/ContractDO.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/dataobject/contract/ContractDO.java index c048b4ea4..485c50623 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/dataobject/contract/ContractDO.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/dataobject/contract/ContractDO.java @@ -1,23 +1,10 @@ package cn.iocoder.yudao.module.cms.dal.dataobject.contract; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; + import java.time.LocalDateTime; import java.math.BigDecimal; -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.math.BigDecimal; -import java.math.BigDecimal; -import java.math.BigDecimal; -import java.math.BigDecimal; -import java.math.BigDecimal; + import com.baomidou.mybatisplus.annotation.*; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; @@ -166,5 +153,4 @@ public class ContractDO extends BaseDO { */ private LocalDateTime updateTime; - } \ No newline at end of file diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/contract/ContractMapper.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/contract/ContractMapper.java index b58c60d60..ee6e9406d 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/contract/ContractMapper.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/contract/ContractMapper.java @@ -18,7 +18,6 @@ public interface ContractMapper extends BaseMapperX { default PageResult selectPage(ContractPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .likeIfPresent(ContractDO::getName, reqVO.getName()) - .eqIfPresent(ContractDO::getProjectId, reqVO.getProjectId()) .eqIfPresent(ContractDO::getType, reqVO.getType()) .eqIfPresent(ContractDO::getProgress, reqVO.getProgress()) .betweenIfPresent(ContractDO::getExpectedTime, reqVO.getExpectedTime()) @@ -44,10 +43,9 @@ public interface ContractMapper extends BaseMapperX { .eqIfPresent(ContractDO::getSurveyFees, reqVO.getSurveyFees()) .eqIfPresent(ContractDO::getMeasurementFee, reqVO.getMeasurementFee()) .eqIfPresent(ContractDO::getOtherFee, reqVO.getOtherFee()) - - .orderByDesc(ContractDO::getId) ); } -} \ No newline at end of file +} + diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contract/ContractService.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contract/ContractService.java index 3661a4d3e..a7236cfd2 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contract/ContractService.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contract/ContractService.java @@ -50,7 +50,7 @@ public interface ContractService { * @param pageReqVO 分页查询 * @return 合同分页 */ - PageResult getContractPage(ContractPageReqVO pageReqVO); + PageResult getContractPage(ContractPageReqVO pageReqVO); /** * 获得暂定结算金额 diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contract/ContractServiceImpl.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contract/ContractServiceImpl.java index 589b1c29d..4a46d32d7 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contract/ContractServiceImpl.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/contract/ContractServiceImpl.java @@ -16,6 +16,8 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; import static cn.iocoder.yudao.module.cms.enums.ErrorCodeConstants.*; @@ -100,8 +102,20 @@ public class ContractServiceImpl implements ContractService { } @Override - public PageResult getContractPage(ContractPageReqVO pageReqVO) { - return contractMapper.selectPage(pageReqVO); + public PageResult getContractPage(ContractPageReqVO pageReqVO) { + PageResult contractDOPageResult = contractMapper.selectPage(pageReqVO); + List contractDOList = contractDOPageResult.getList(); + List contractRespVOList = new ArrayList<>(); + + + for (ContractDO contractDO : contractDOList) { + Long id = contractDO.getId(); + ContractRespVO contract = getContract(id); + contractRespVOList.add(contract); + } + PageResult pageResult = new PageResult<>(); + pageResult.setList(contractRespVOList); + return pageResult; } @Override