diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml index 63f9095..4ae7296 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml @@ -30,7 +30,7 @@ bcp.id, certificate_report_code, certificate_report_name, original_record_id, original_record_name, certificate_report_category, certificate_report_type,measure_content,measure_type, sample_id, sample_name, order_id, customer_no, customer_name, customer_phone, customer_email, customer_address, deliverer_id, deliverer, deliverer_tel, plan_deliver_time, require_over_time, approval_status, print_num, print_status, measure_dept_id, measure_person_id,certificate_report_file, remark, create_user, create_time, is_del - ,sign_id,template_id,process_id,manufacturing_no,sample_model,original_record_code,sample_no + ,sign_id,template_id,process_id,manufacturing_no,sample_model,original_record_code,sample_no,print_file_name as printFileName diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificatePrintDetail.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificatePrintDetail.java index 5c897da..4ee9515 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificatePrintDetail.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificatePrintDetail.java @@ -17,6 +17,10 @@ @TableId("id") private Long id; + @ApiModelProperty("打印文件名称") + private String printFileName; + + @ApiModelProperty("证书报告编号") @TableField("certificate_report_code") private String certificateReportCode; diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml index 63f9095..4ae7296 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificatePrintMapper.xml @@ -30,7 +30,7 @@ bcp.id, certificate_report_code, certificate_report_name, original_record_id, original_record_name, certificate_report_category, certificate_report_type,measure_content,measure_type, sample_id, sample_name, order_id, customer_no, customer_name, customer_phone, customer_email, customer_address, deliverer_id, deliverer, deliverer_tel, plan_deliver_time, require_over_time, approval_status, print_num, print_status, measure_dept_id, measure_person_id,certificate_report_file, remark, create_user, create_time, is_del - ,sign_id,template_id,process_id,manufacturing_no,sample_model,original_record_code,sample_no + ,sign_id,template_id,process_id,manufacturing_no,sample_model,original_record_code,sample_no,print_file_name as printFileName diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificatePrintDetail.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificatePrintDetail.java index 5c897da..4ee9515 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificatePrintDetail.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificatePrintDetail.java @@ -17,6 +17,10 @@ @TableId("id") private Long id; + @ApiModelProperty("打印文件名称") + private String printFileName; + + @ApiModelProperty("证书报告编号") @TableField("certificate_report_code") private String certificateReportCode; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateRefusePrintRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateRefusePrintRequest.java index 24faaf3..7befa26 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateRefusePrintRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/print/CertificateRefusePrintRequest.java @@ -5,13 +5,14 @@ import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; @Data @ApiModel("证书打印状态") public class CertificateRefusePrintRequest { @ApiModelProperty("证书报告id") - @NotBlank(message = "证书报告id不能为空") + @NotNull(message = "证书报告id不能为空") private Long id; @ApiModelProperty("任务id") 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 2aef3c0..a47e395 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 @@ -181,13 +181,15 @@ request.setApprovalStatus(""); } List businessKeys = null; - switch (request.getApprovalStatus()) { - case ApprovalStatusEnum.IN_APPROVED: - businessKeys = baseApprovalService.getInApprovedList(request.getFormId()); - break; - case ApprovalStatusEnum.PASSED: - businessKeys = baseApprovalService.getPassedList(request.getFormId()); - break; + if (StringUtils.isNotEmpty(request.getApprovalStatus())) { + switch (request.getApprovalStatus()) { + case ApprovalStatusEnum.IN_APPROVED: + businessKeys = baseApprovalService.getInApprovedList(request.getFormId()); + break; + case ApprovalStatusEnum.PASSED: + businessKeys = baseApprovalService.getPassedList(request.getFormId()); + break; + } } if (CollectionUtil.isEmpty(businessKeys)) { businessKeys = null;