diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApprovalStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApprovalStatusEnum.java index 998b89d..444dbb9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApprovalStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApprovalStatusEnum.java @@ -25,4 +25,6 @@ String CANCELED = "6"; //非草稿状态，仅在枚举中设置，字典中不设置 String UN_DRAFT = "7"; + //删除，已取消中提交后的原有实例删除，仅在枚举中设置，字典中不设置 + String DELETED = "8"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApprovalStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApprovalStatusEnum.java index 998b89d..444dbb9 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApprovalStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/system/ApprovalStatusEnum.java @@ -25,4 +25,6 @@ String CANCELED = "6"; //非草稿状态，仅在枚举中设置，字典中不设置 String UN_DRAFT = "7"; + //删除，已取消中提交后的原有实例删除，仅在枚举中设置，字典中不设置 + String DELETED = "8"; } 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 aa83386..45758ed 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -33,6 +33,65 @@ , certificate_report_code, certificate_report_name, certificate_report_category, calibration_major, issuance_date, expiration_date, template_id, sign_id, approval_sign_id, certificate_report_file, original_record_id, print_status, print_num, remark, is_del, create_user, create_time, update_time + + + SELECT bcr.id,bcr.certificate_report_code AS "certificateNo",bcr.certificate_report_name AS + "certificateName",csi.sample_no AS "sampleNo", + csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS + "manufacturingNo",bo.order_code AS "orderNo", + csi.measure_type AS "measureType",bcr.certificate_report_type AS "certificateType",bcr.print_status AS + "printStatus",bcr.print_num AS "printNum", + bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS + "measurePersonId" + FROM ( + SELECT * + FROM business_certificate_report + WHERE is_del = 0 + + and certificate_report_code like concat('%',#{request.certificateNo},'%') + + + and certificate_report_category like concat('%',#{request.certificateClass},'%') + + + and print_status = #{request.printStatus} + + + and bcr.id in + + #{id} + + + + and bcr.id in + + #{id} + + + ) bcr + JOIN ( + SELECT * + FROM business_order + WHERE is_del=0 + + and ORDER_CODE like concat('%',#{request.orderNo},'%') + + + and CUSTOMER_NAME like concat('%',#{request.customerName},'%') + + ) bo ON bo.id=bcr.order_id + JOIN ( + SELECT id,sample_no,sample_name,sample_model,manufacturing_no,measure_type + FROM customer_sample_info + WHERE is_del=0 + + and SAMPLE_NO like concat('%',#{request.sampleNo},'%') + + + and SAMPLE_NAME like concat('%',#{request.sampleName},'%') + + ) csi ON csi.id=bcr.sample_id + + + SELECT bcr.id,bcr.certificate_report_code AS "certificateNo",bcr.certificate_report_name AS + "certificateName",csi.sample_no AS "sampleNo", + csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS + "manufacturingNo",bo.order_code AS "orderNo", + csi.measure_type AS "measureType",bcr.certificate_report_type AS "certificateType",bcr.print_status AS + "printStatus",bcr.print_num AS "printNum", + bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS + "measurePersonId" + FROM ( + SELECT * + FROM business_certificate_report + WHERE is_del = 0 + + and certificate_report_code like concat('%',#{request.certificateNo},'%') + + + and certificate_report_category like concat('%',#{request.certificateClass},'%') + + + and print_status = #{request.printStatus} + + + and bcr.id in + + #{id} + + + + and bcr.id in + + #{id} + + + ) bcr + JOIN ( + SELECT * + FROM business_order + WHERE is_del=0 + + and ORDER_CODE like concat('%',#{request.orderNo},'%') + + + and CUSTOMER_NAME like concat('%',#{request.customerName},'%') + + ) bo ON bo.id=bcr.order_id + JOIN ( + SELECT id,sample_no,sample_name,sample_model,manufacturing_no,measure_type + FROM customer_sample_info + WHERE is_del=0 + + and SAMPLE_NO like concat('%',#{request.sampleNo},'%') + + + and SAMPLE_NAME like concat('%',#{request.sampleName},'%') + + ) csi ON csi.id=bcr.sample_id + + + SELECT bcr.id,bcr.certificate_report_code AS "certificateNo",bcr.certificate_report_name AS + "certificateName",csi.sample_no AS "sampleNo", + csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS + "manufacturingNo",bo.order_code AS "orderNo", + csi.measure_type AS "measureType",bcr.certificate_report_type AS "certificateType",bcr.print_status AS + "printStatus",bcr.print_num AS "printNum", + bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS + "measurePersonId" + FROM ( + SELECT * + FROM business_certificate_report + WHERE is_del = 0 + + and certificate_report_code like concat('%',#{request.certificateNo},'%') + + + and certificate_report_category like concat('%',#{request.certificateClass},'%') + + + and print_status = #{request.printStatus} + + + and bcr.id in + + #{id} + + + + and bcr.id in + + #{id} + + + ) bcr + JOIN ( + SELECT * + FROM business_order + WHERE is_del=0 + + and ORDER_CODE like concat('%',#{request.orderNo},'%') + + + and CUSTOMER_NAME like concat('%',#{request.customerName},'%') + + ) bo ON bo.id=bcr.order_id + JOIN ( + SELECT id,sample_no,sample_name,sample_model,manufacturing_no,measure_type + FROM customer_sample_info + WHERE is_del=0 + + and SAMPLE_NO like concat('%',#{request.sampleNo},'%') + + + and SAMPLE_NAME like concat('%',#{request.sampleName},'%') + + ) csi ON csi.id=bcr.sample_id + + + SELECT bcr.id,bcr.certificate_report_code AS "certificateNo",bcr.certificate_report_name AS + "certificateName",csi.sample_no AS "sampleNo", + csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS + "manufacturingNo",bo.order_code AS "orderNo", + csi.measure_type AS "measureType",bcr.certificate_report_type AS "certificateType",bcr.print_status AS + "printStatus",bcr.print_num AS "printNum", + bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS + "measurePersonId" + FROM ( + SELECT * + FROM business_certificate_report + WHERE is_del = 0 + + and certificate_report_code like concat('%',#{request.certificateNo},'%') + + + and certificate_report_category like concat('%',#{request.certificateClass},'%') + + + and print_status = #{request.printStatus} + + + and bcr.id in + + #{id} + + + + and bcr.id in + + #{id} + + + ) bcr + JOIN ( + SELECT * + FROM business_order + WHERE is_del=0 + + and ORDER_CODE like concat('%',#{request.orderNo},'%') + + + and CUSTOMER_NAME like concat('%',#{request.customerName},'%') + + ) bo ON bo.id=bcr.order_id + JOIN ( + SELECT id,sample_no,sample_name,sample_model,manufacturing_no,measure_type + FROM customer_sample_info + WHERE is_del=0 + + and SAMPLE_NO like concat('%',#{request.sampleNo},'%') + + + and SAMPLE_NAME like concat('%',#{request.sampleName},'%') + + ) csi ON csi.id=bcr.sample_id + + + SELECT bcr.id,bcr.certificate_report_code AS "certificateNo",bcr.certificate_report_name AS + "certificateName",csi.sample_no AS "sampleNo", + csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS + "manufacturingNo",bo.order_code AS "orderNo", + csi.measure_type AS "measureType",bcr.certificate_report_type AS "certificateType",bcr.print_status AS + "printStatus",bcr.print_num AS "printNum", + bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS + "measurePersonId" + FROM ( + SELECT * + FROM business_certificate_report + WHERE is_del = 0 + + and certificate_report_code like concat('%',#{request.certificateNo},'%') + + + and certificate_report_category like concat('%',#{request.certificateClass},'%') + + + and print_status = #{request.printStatus} + + + and bcr.id in + + #{id} + + + + and bcr.id in + + #{id} + + + ) bcr + JOIN ( + SELECT * + FROM business_order + WHERE is_del=0 + + and ORDER_CODE like concat('%',#{request.orderNo},'%') + + + and CUSTOMER_NAME like concat('%',#{request.customerName},'%') + + ) bo ON bo.id=bcr.order_id + JOIN ( + SELECT id,sample_no,sample_name,sample_model,manufacturing_no,measure_type + FROM customer_sample_info + WHERE is_del=0 + + and SAMPLE_NO like concat('%',#{request.sampleNo},'%') + + + and SAMPLE_NAME like concat('%',#{request.sampleName},'%') + + ) csi ON csi.id=bcr.sample_id + + + SELECT bcr.id,bcr.certificate_report_code AS "certificateNo",bcr.certificate_report_name AS + "certificateName",csi.sample_no AS "sampleNo", + csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS + "manufacturingNo",bo.order_code AS "orderNo", + csi.measure_type AS "measureType",bcr.certificate_report_type AS "certificateType",bcr.print_status AS + "printStatus",bcr.print_num AS "printNum", + bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS + "measurePersonId" + FROM ( + SELECT * + FROM business_certificate_report + WHERE is_del = 0 + + and certificate_report_code like concat('%',#{request.certificateNo},'%') + + + and certificate_report_category like concat('%',#{request.certificateClass},'%') + + + and print_status = #{request.printStatus} + + + and bcr.id in + + #{id} + + + + and bcr.id in + + #{id} + + + ) bcr + JOIN ( + SELECT * + FROM business_order + WHERE is_del=0 + + and ORDER_CODE like concat('%',#{request.orderNo},'%') + + + and CUSTOMER_NAME like concat('%',#{request.customerName},'%') + + ) bo ON bo.id=bcr.order_id + JOIN ( + SELECT id,sample_no,sample_name,sample_model,manufacturing_no,measure_type + FROM customer_sample_info + WHERE is_del=0 + + and SAMPLE_NO like concat('%',#{request.sampleNo},'%') + + + and SAMPLE_NAME like concat('%',#{request.sampleName},'%') + + ) csi ON csi.id=bcr.sample_id + + + SELECT bcr.id,bcr.certificate_report_code AS "certificateNo",bcr.certificate_report_name AS + "certificateName",csi.sample_no AS "sampleNo", + csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS + "manufacturingNo",bo.order_code AS "orderNo", + csi.measure_type AS "measureType",bcr.certificate_report_type AS "certificateType",bcr.print_status AS + "printStatus",bcr.print_num AS "printNum", + bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS + "measurePersonId" + FROM ( + SELECT * + FROM business_certificate_report + WHERE is_del = 0 + + and certificate_report_code like concat('%',#{request.certificateNo},'%') + + + and certificate_report_category like concat('%',#{request.certificateClass},'%') + + + and print_status = #{request.printStatus} + + + and bcr.id in + + #{id} + + + + and bcr.id in + + #{id} + + + ) bcr + JOIN ( + SELECT * + FROM business_order + WHERE is_del=0 + + and ORDER_CODE like concat('%',#{request.orderNo},'%') + + + and CUSTOMER_NAME like concat('%',#{request.customerName},'%') + + ) bo ON bo.id=bcr.order_id + JOIN ( + SELECT id,sample_no,sample_name,sample_model,manufacturing_no,measure_type + FROM customer_sample_info + WHERE is_del=0 + + and SAMPLE_NO like concat('%',#{request.sampleNo},'%') + + + and SAMPLE_NAME like concat('%',#{request.sampleName},'%') + + ) csi ON csi.id=bcr.sample_id + + + SELECT bcr.id,bcr.certificate_report_code AS "certificateNo",bcr.certificate_report_name AS + "certificateName",csi.sample_no AS "sampleNo", + csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS + "manufacturingNo",bo.order_code AS "orderNo", + csi.measure_type AS "measureType",bcr.certificate_report_type AS "certificateType",bcr.print_status AS + "printStatus",bcr.print_num AS "printNum", + bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS + "measurePersonId" + FROM ( + SELECT * + FROM business_certificate_report + WHERE is_del = 0 + + and certificate_report_code like concat('%',#{request.certificateNo},'%') + + + and certificate_report_category like concat('%',#{request.certificateClass},'%') + + + and print_status = #{request.printStatus} + + + and bcr.id in + + #{id} + + + + and bcr.id in + + #{id} + + + ) bcr + JOIN ( + SELECT * + FROM business_order + WHERE is_del=0 + + and ORDER_CODE like concat('%',#{request.orderNo},'%') + + + and CUSTOMER_NAME like concat('%',#{request.customerName},'%') + + ) bo ON bo.id=bcr.order_id + JOIN ( + SELECT id,sample_no,sample_name,sample_model,manufacturing_no,measure_type + FROM customer_sample_info + WHERE is_del=0 + + and SAMPLE_NO like concat('%',#{request.sampleNo},'%') + + + and SAMPLE_NAME like concat('%',#{request.sampleName},'%') + + ) csi ON csi.id=bcr.sample_id + + + SELECT bcr.id,bcr.certificate_report_code AS "certificateNo",bcr.certificate_report_name AS + "certificateName",csi.sample_no AS "sampleNo", + csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS + "manufacturingNo",bo.order_code AS "orderNo", + csi.measure_type AS "measureType",bcr.certificate_report_type AS "certificateType",bcr.print_status AS + "printStatus",bcr.print_num AS "printNum", + bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS + "measurePersonId" + FROM ( + SELECT * + FROM business_certificate_report + WHERE is_del = 0 + + and certificate_report_code like concat('%',#{request.certificateNo},'%') + + + and certificate_report_category like concat('%',#{request.certificateClass},'%') + + + and print_status = #{request.printStatus} + + + and bcr.id in + + #{id} + + + + and bcr.id in + + #{id} + + + ) bcr + JOIN ( + SELECT * + FROM business_order + WHERE is_del=0 + + and ORDER_CODE like concat('%',#{request.orderNo},'%') + + + and CUSTOMER_NAME like concat('%',#{request.customerName},'%') + + ) bo ON bo.id=bcr.order_id + JOIN ( + SELECT id,sample_no,sample_name,sample_model,manufacturing_no,measure_type + FROM customer_sample_info + WHERE is_del=0 + + and SAMPLE_NO like concat('%',#{request.sampleNo},'%') + + + and SAMPLE_NAME like concat('%',#{request.sampleName},'%') + + ) csi ON csi.id=bcr.sample_id + + + SELECT bcr.id,bcr.certificate_report_code AS "certificateNo",bcr.certificate_report_name AS + "certificateName",csi.sample_no AS "sampleNo", + csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS + "manufacturingNo",bo.order_code AS "orderNo", + csi.measure_type AS "measureType",bcr.certificate_report_type AS "certificateType",bcr.print_status AS + "printStatus",bcr.print_num AS "printNum", + bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS + "measurePersonId" + FROM ( + SELECT * + FROM business_certificate_report + WHERE is_del = 0 + + and certificate_report_code like concat('%',#{request.certificateNo},'%') + + + and certificate_report_category like concat('%',#{request.certificateClass},'%') + + + and print_status = #{request.printStatus} + + + and bcr.id in + + #{id} + + + + and bcr.id in + + #{id} + + + ) bcr + JOIN ( + SELECT * + FROM business_order + WHERE is_del=0 + + and ORDER_CODE like concat('%',#{request.orderNo},'%') + + + and CUSTOMER_NAME like concat('%',#{request.customerName},'%') + + ) bo ON bo.id=bcr.order_id + JOIN ( + SELECT id,sample_no,sample_name,sample_model,manufacturing_no,measure_type + FROM customer_sample_info + WHERE is_del=0 + + and SAMPLE_NO like concat('%',#{request.sampleNo},'%') + + + and SAMPLE_NAME like concat('%',#{request.sampleName},'%') + + ) csi ON csi.id=bcr.sample_id + + + SELECT bcr.id,bcr.certificate_report_code AS "certificateNo",bcr.certificate_report_name AS + "certificateName",csi.sample_no AS "sampleNo", + csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS + "manufacturingNo",bo.order_code AS "orderNo", + csi.measure_type AS "measureType",bcr.certificate_report_type AS "certificateType",bcr.print_status AS + "printStatus",bcr.print_num AS "printNum", + bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS + "measurePersonId" + FROM ( + SELECT * + FROM business_certificate_report + WHERE is_del = 0 + + and certificate_report_code like concat('%',#{request.certificateNo},'%') + + + and certificate_report_category like concat('%',#{request.certificateClass},'%') + + + and print_status = #{request.printStatus} + + + and bcr.id in + + #{id} + + + + and bcr.id in + + #{id} + + + ) bcr + JOIN ( + SELECT * + FROM business_order + WHERE is_del=0 + + and ORDER_CODE like concat('%',#{request.orderNo},'%') + + + and CUSTOMER_NAME like concat('%',#{request.customerName},'%') + + ) bo ON bo.id=bcr.order_id + JOIN ( + SELECT id,sample_no,sample_name,sample_model,manufacturing_no,measure_type + FROM customer_sample_info + WHERE is_del=0 + + and SAMPLE_NO like concat('%',#{request.sampleNo},'%') + + + and SAMPLE_NAME like concat('%',#{request.sampleName},'%') + + ) csi ON csi.id=bcr.sample_id + + + SELECT bcr.id,bcr.certificate_report_code AS "certificateNo",bcr.certificate_report_name AS + "certificateName",csi.sample_no AS "sampleNo", + csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS + "manufacturingNo",bo.order_code AS "orderNo", + csi.measure_type AS "measureType",bcr.certificate_report_type AS "certificateType",bcr.print_status AS + "printStatus",bcr.print_num AS "printNum", + bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS + "measurePersonId" + FROM ( + SELECT * + FROM business_certificate_report + WHERE is_del = 0 + + and certificate_report_code like concat('%',#{request.certificateNo},'%') + + + and certificate_report_category like concat('%',#{request.certificateClass},'%') + + + and print_status = #{request.printStatus} + + + and bcr.id in + + #{id} + + + + and bcr.id in + + #{id} + + + ) bcr + JOIN ( + SELECT * + FROM business_order + WHERE is_del=0 + + and ORDER_CODE like concat('%',#{request.orderNo},'%') + + + and CUSTOMER_NAME like concat('%',#{request.customerName},'%') + + ) bo ON bo.id=bcr.order_id + JOIN ( + SELECT id,sample_no,sample_name,sample_model,manufacturing_no,measure_type + FROM customer_sample_info + WHERE is_del=0 + + and SAMPLE_NO like concat('%',#{request.sampleNo},'%') + + + and SAMPLE_NAME like concat('%',#{request.sampleName},'%') + + ) csi ON csi.id=bcr.sample_id + + + SELECT bcr.id,bcr.certificate_report_code AS "certificateNo",bcr.certificate_report_name AS + "certificateName",csi.sample_no AS "sampleNo", + csi.sample_name AS "sampleName",csi.sample_model AS "sampleModel",csi.manufacturing_no AS + "manufacturingNo",bo.order_code AS "orderNo", + csi.measure_type AS "measureType",bcr.certificate_report_type AS "certificateType",bcr.print_status AS + "printStatus",bcr.print_num AS "printNum", + bcr.approval_status AS "approvalStatus",bcr.create_time AS "createTime",bcr.measure_person_id AS + "measurePersonId" + FROM ( + SELECT * + FROM business_certificate_report + WHERE is_del = 0 + + and certificate_report_code like concat('%',#{request.certificateNo},'%') + + + and certificate_report_category like concat('%',#{request.certificateClass},'%') + + + and print_status = #{request.printStatus} + + + and bcr.id in + + #{id} + + + + and bcr.id in + + #{id} + + + ) bcr + JOIN ( + SELECT * + FROM business_order + WHERE is_del=0 + + and ORDER_CODE like concat('%',#{request.orderNo},'%') + + + and CUSTOMER_NAME like concat('%',#{request.customerName},'%') + + ) bo ON bo.id=bcr.order_id + JOIN ( + SELECT id,sample_no,sample_name,sample_model,manufacturing_no,measure_type + FROM customer_sample_info + WHERE is_del=0 + + and SAMPLE_NO like concat('%',#{request.sampleNo},'%') + + + and SAMPLE_NAME like concat('%',#{request.sampleName},'%') + + ) csi ON csi.id=bcr.sample_id + +