[fix] 优化外部合同管理功能

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<PageResult<ExtContractRespVO>> getExtContractPage(@Valid ExtContractPageReqVO pageReqVO) {
-        PageResult<ExtContractDO> pageResult = extContractService.getExtContractPage(pageReqVO);
+        PageResult<ExtContractRespVO> pageResult = extContractService.getExtContractPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, ExtContractRespVO.class));
+        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<ExtContractDO> list = extContractService.getExtContractPage(pageReqVO).getList();
+        List<ExtContractRespVO> list = extContractService.getExtContractPage(pageReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "外部合同.xls", "数据", ExtContractRespVO.class,
                         BeanUtils.toBean(list, ExtContractRespVO.class));

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<ExtContractDO> {
                 .eqIfPresent(ExtContractDO::getReviewFileUrl, reqVO.getReviewFileUrl())
                 .betweenIfPresent(ExtContractDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(ExtContractDO::getContractId, reqVO.getContractId())
-                .orderByDesc(ExtContractDO::getId));
+
+        );
     }
 
 }

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<ExtContractDO> getExtContractPage(ExtContractPageReqVO pageReqVO);
+    PageResult<ExtContractRespVO> getExtContractPage(ExtContractPageReqVO pageReqVO);
 
     /**
      * 合同总金额

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<ExtContractDO> getExtContractPage(ExtContractPageReqVO pageReqVO) {
+    public PageResult<ExtContractRespVO> getExtContractPage(ExtContractPageReqVO pageReqVO) {
-        return extContractMapper.selectPage(pageReqVO);
+
+        PageResult<ExtContractDO> extContractDOPageResult = extContractMapper.selectPage(pageReqVO);
+        List<ExtContractDO> excontractDOList = extContractDOPageResult.getList();
+        List<ExtContractRespVO> extContractRespVOList = new ArrayList<>();
+
+
+        for (ExtContractDO extContractDO : excontractDOList) {
+            Long id = extContractDO.getId();
+            ExtContractRespVO extContractRespVO = getExtContract(id);
+            extContractRespVOList.add(extContractRespVO);
+        }
+        PageResult<ExtContractRespVO> pageResult = new PageResult<>();
+        pageResult.setList(extContractRespVOList);
+        return pageResult;
     }
 
     @Override