From 591d5bc495c99a1b2975694e672f4b3dab80b95b Mon Sep 17 00:00:00 2001 From: wyw <13885678+wyw0828@user.noreply.gitee.com> Date: Thu, 25 Jul 2024 14:42:42 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E4=BC=98=E5=8C=96=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E5=90=88=E5=90=8C=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extcontract/ExtContractController.java | 6 +++--- .../mysql/extcontract/ExtContractMapper.java | 3 ++- .../extcontract/ExtContractService.java | 2 +- .../extcontract/ExtContractServiceImpl.java | 21 +++++++++++++++++-- 4 files changed, 25 insertions(+), 7 deletions(-) diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extcontract/ExtContractController.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extcontract/ExtContractController.java index 2e9e8336a..15aa5260a 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extcontract/ExtContractController.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/controller/admin/extcontract/ExtContractController.java @@ -76,8 +76,8 @@ public class ExtContractController { @Operation(summary = "获得外部合同分页") @PreAuthorize("@ss.hasPermission('cms-ext:ext-contract:query')") public CommonResult> getExtContractPage(@Valid ExtContractPageReqVO pageReqVO) { - PageResult pageResult = extContractService.getExtContractPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, ExtContractRespVO.class)); + PageResult pageResult = extContractService.getExtContractPage(pageReqVO); + return success(pageResult); } @GetMapping("/export-excel") @@ -87,7 +87,7 @@ public class ExtContractController { public void exportExtContractExcel(@Valid ExtContractPageReqVO pageReqVO, HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = extContractService.getExtContractPage(pageReqVO).getList(); + List list = extContractService.getExtContractPage(pageReqVO).getList(); // 导出 Excel ExcelUtils.write(response, "外部合同.xls", "数据", ExtContractRespVO.class, BeanUtils.toBean(list, ExtContractRespVO.class)); diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/extcontract/ExtContractMapper.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/extcontract/ExtContractMapper.java index 2e7cc77b6..e89c25274 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/extcontract/ExtContractMapper.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/dal/mysql/extcontract/ExtContractMapper.java @@ -44,7 +44,8 @@ public interface ExtContractMapper extends BaseMapperX { .eqIfPresent(ExtContractDO::getReviewFileUrl, reqVO.getReviewFileUrl()) .betweenIfPresent(ExtContractDO::getCreateTime, reqVO.getCreateTime()) .eqIfPresent(ExtContractDO::getContractId, reqVO.getContractId()) - .orderByDesc(ExtContractDO::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/extcontract/ExtContractService.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/extcontract/ExtContractService.java index ff0f12268..576a42ae2 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/extcontract/ExtContractService.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/extcontract/ExtContractService.java @@ -53,7 +53,7 @@ public interface ExtContractService { * @param pageReqVO 分页查询 * @return 外部合同分页 */ - PageResult getExtContractPage(ExtContractPageReqVO pageReqVO); + PageResult getExtContractPage(ExtContractPageReqVO pageReqVO); /** * 合同总金额 diff --git a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/extcontract/ExtContractServiceImpl.java b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/extcontract/ExtContractServiceImpl.java index 97b9f1a1b..3ba1366a1 100644 --- a/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/extcontract/ExtContractServiceImpl.java +++ b/yudao-module-cms/yudao-module-cms-biz/src/main/java/cn/iocoder/yudao/module/cms/service/extcontract/ExtContractServiceImpl.java @@ -1,8 +1,10 @@ package cn.iocoder.yudao.module.cms.service.extcontract; +import cn.iocoder.yudao.module.cms.controller.admin.contract.vo.ContractRespVO; import cn.iocoder.yudao.module.cms.controller.admin.extcontract.vo.ExtContractPageReqVO; import cn.iocoder.yudao.module.cms.controller.admin.extcontract.vo.ExtContractRespVO; import cn.iocoder.yudao.module.cms.controller.admin.extcontract.vo.ExtContractSaveReqVO; +import cn.iocoder.yudao.module.cms.dal.dataobject.contract.ContractDO; import cn.iocoder.yudao.module.cms.dal.dataobject.customerCompany.CustomerCompanyDO; import cn.iocoder.yudao.module.cms.dal.dataobject.extcontract.ExtContractDO; import cn.iocoder.yudao.module.cms.dal.mysql.customerCompany.CustomerCompanyMapper; @@ -17,6 +19,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.EXT_CONTRACT_NOT_EXISTS; @@ -111,8 +115,21 @@ public class ExtContractServiceImpl implements ExtContractService { } @Override - public PageResult getExtContractPage(ExtContractPageReqVO pageReqVO) { - return extContractMapper.selectPage(pageReqVO); + public PageResult getExtContractPage(ExtContractPageReqVO pageReqVO) { + + PageResult extContractDOPageResult = extContractMapper.selectPage(pageReqVO); + List excontractDOList = extContractDOPageResult.getList(); + List extContractRespVOList = new ArrayList<>(); + + + for (ExtContractDO extContractDO : excontractDOList) { + Long id = extContractDO.getId(); + ExtContractRespVO extContractRespVO = getExtContract(id); + extContractRespVOList.add(extContractRespVO); + } + PageResult pageResult = new PageResult<>(); + pageResult.setList(extContractRespVOList); + return pageResult; } @Override