diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java index e7b6778..c80edce 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -25,7 +25,7 @@ */ public interface BusinessCertificateReportMapper extends BaseMapper { - List selectBatchForApprovalList(@Param("page")Page page, @Param("request") CertificateListRequest request, @Param("businessKey") List businessKey); + Page selectBatchForApprovalList(@Param("page")Page page, @Param("request") CertificateListRequest request, @Param("businessKey") List businessKey); List selectDraftListForApproval(@Param("page")Page page, @Param("request") CertificateReportApprovalRequest request); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java index e7b6778..c80edce 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessCertificateReportMapper.java @@ -25,7 +25,7 @@ */ public interface BusinessCertificateReportMapper extends BaseMapper { - List selectBatchForApprovalList(@Param("page")Page page, @Param("request") CertificateListRequest request, @Param("businessKey") List businessKey); + Page selectBatchForApprovalList(@Param("page")Page page, @Param("request") CertificateListRequest request, @Param("businessKey") List businessKey); List selectDraftListForApproval(@Param("page")Page page, @Param("request") CertificateReportApprovalRequest request); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java index 9a0712f..2f97cb3 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessCertificatePrintServiceImpl.java @@ -144,7 +144,7 @@ if (request.getApprovalStatus().equals(ApprovalStatusEnum.TO_BE_APPROVED)&&CollectionUtils.isEmpty(request.getIds())) { handlerBeApproved(approvalList, page, request); }else { - approvalList.setRecords(this.baseMapper.selectBatchForApprovalList(page, request, null)); + approvalList=this.baseMapper.selectBatchForApprovalList(page, request, null); } for (CertificateListResponse certificateListResponse : approvalList.getRecords()) { DictCodeUtils.convertDictCodeToName(certificateListResponse); @@ -162,7 +162,7 @@ businessKeys = toBeApprovedList.stream().map(ToBeApprovedDTO::getBusinessKey).collect(Collectors.toList()); } if (!CollectionUtils.isEmpty(businessKeys)) { - approvalList.setRecords(this.baseMapper.selectBatchForApprovalList(page, request, businessKeys)); + approvalList=this.baseMapper.selectBatchForApprovalList(page, request, businessKeys); //DTO根据业务主键补全taskId approvalList.getRecords().forEach(approval -> { toBeApprovedList.forEach(toBeApprovedDTO -> {