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 38873c7..e7b6778 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,11 +25,11 @@ */ public interface BusinessCertificateReportMapper extends BaseMapper { - List selectBatchForApprovalList(Page page, @Param("request") CertificateListRequest request, @Param("businessKey") List businessKey); + List selectBatchForApprovalList(@Param("page")Page page, @Param("request") CertificateListRequest request, @Param("businessKey") List businessKey); - List selectDraftListForApproval(Page page, @Param("request") CertificateReportApprovalRequest request); + List selectDraftListForApproval(@Param("page")Page page, @Param("request") CertificateReportApprovalRequest request); - List selectBatchForApproval(Page page, @Param("request") CertificateReportApprovalRequest request, @Param("businessKey") List businessKey); + List selectBatchForApproval(@Param("page")Page page, @Param("request") CertificateReportApprovalRequest request, @Param("businessKey") List businessKey); @Select("SELECT IFNULL(max(RIGHT(certificate_report_code, 9)), 0) from business_certificate_report where certificate_report_code like CONCAT(#{prefix},'%')") 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 38873c7..e7b6778 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,11 +25,11 @@ */ public interface BusinessCertificateReportMapper extends BaseMapper { - List selectBatchForApprovalList(Page page, @Param("request") CertificateListRequest request, @Param("businessKey") List businessKey); + List selectBatchForApprovalList(@Param("page")Page page, @Param("request") CertificateListRequest request, @Param("businessKey") List businessKey); - List selectDraftListForApproval(Page page, @Param("request") CertificateReportApprovalRequest request); + List selectDraftListForApproval(@Param("page")Page page, @Param("request") CertificateReportApprovalRequest request); - List selectBatchForApproval(Page page, @Param("request") CertificateReportApprovalRequest request, @Param("businessKey") List businessKey); + List selectBatchForApproval(@Param("page")Page page, @Param("request") CertificateReportApprovalRequest request, @Param("businessKey") List businessKey); @Select("SELECT IFNULL(max(RIGHT(certificate_report_code, 9)), 0) from business_certificate_report where certificate_report_code like CONCAT(#{prefix},'%')") diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml index 92d1d35..f49dc26 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -48,7 +48,7 @@ and certificate_class like concat('%',#{request.certificateClass},'%') - and print_status like concat('%',#{request.printStatus},'%') + and print_status = #{request.printStatus} and bcr.id in 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 38873c7..e7b6778 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,11 +25,11 @@ */ public interface BusinessCertificateReportMapper extends BaseMapper { - List selectBatchForApprovalList(Page page, @Param("request") CertificateListRequest request, @Param("businessKey") List businessKey); + List selectBatchForApprovalList(@Param("page")Page page, @Param("request") CertificateListRequest request, @Param("businessKey") List businessKey); - List selectDraftListForApproval(Page page, @Param("request") CertificateReportApprovalRequest request); + List selectDraftListForApproval(@Param("page")Page page, @Param("request") CertificateReportApprovalRequest request); - List selectBatchForApproval(Page page, @Param("request") CertificateReportApprovalRequest request, @Param("businessKey") List businessKey); + List selectBatchForApproval(@Param("page")Page page, @Param("request") CertificateReportApprovalRequest request, @Param("businessKey") List businessKey); @Select("SELECT IFNULL(max(RIGHT(certificate_report_code, 9)), 0) from business_certificate_report where certificate_report_code like CONCAT(#{prefix},'%')") diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml index 92d1d35..f49dc26 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -48,7 +48,7 @@ and certificate_class like concat('%',#{request.certificateClass},'%') - and print_status like concat('%',#{request.printStatus},'%') + and print_status = #{request.printStatus} and bcr.id in 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 230c779..9a0712f 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 @@ -141,13 +141,9 @@ */ private Page handleApprovalStatus(Page page, CertificateListRequest request) throws Exception { Page approvalList = PageFactory.defaultPage(); - if (request.getApprovalStatus().equals(ApprovalStatusEnum.TO_BE_APPROVED)) { + if (request.getApprovalStatus().equals(ApprovalStatusEnum.TO_BE_APPROVED)&&CollectionUtils.isEmpty(request.getIds())) { handlerBeApproved(approvalList, page, request); - } else if("0".equals(request.getPrintStatus())) { - request.setApprovalStatus(null); - approvalList.setRecords(this.baseMapper.selectBatchForApprovalList(page, request, null)); - } else { - request.setPrintStatus(null); + }else { approvalList.setRecords(this.baseMapper.selectBatchForApprovalList(page, request, null)); } for (CertificateListResponse certificateListResponse : approvalList.getRecords()) {