diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java index dad016b..ecc1669 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -6,6 +6,8 @@ import com.casic.missiles.dto.business.SampleHandOutListRequest; import com.casic.missiles.dto.business.SampleHandOutListResponse; import com.casic.missiles.dto.business.SampleHandOutDetailRequest; +import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO; +import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO; import com.casic.missiles.model.business.BusinessOrderSampleRelation; import org.apache.ibatis.annotations.Param; @@ -21,5 +23,7 @@ Page selectSampleListByStatus(Page page, @Param("request") SampleHandOutListRequest request); + Page getSampleListByStatus(@Param("page") Page page, @Param("request") DeviceDispatchDTO request); + SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java index dad016b..ecc1669 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessOrderSampleRelationMapper.java @@ -6,6 +6,8 @@ import com.casic.missiles.dto.business.SampleHandOutListRequest; import com.casic.missiles.dto.business.SampleHandOutListResponse; import com.casic.missiles.dto.business.SampleHandOutDetailRequest; +import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO; +import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO; import com.casic.missiles.model.business.BusinessOrderSampleRelation; import org.apache.ibatis.annotations.Param; @@ -21,5 +23,7 @@ Page selectSampleListByStatus(Page page, @Param("request") SampleHandOutListRequest request); + Page getSampleListByStatus(@Param("page") Page page, @Param("request") DeviceDispatchDTO request); + SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index c385826..d2c0633 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -4,10 +4,10 @@ - - - - + + + + @@ -29,8 +29,71 @@ csi.measure_last_time, csi.valid_deadline, bosr.remark, csi.minio_file_name, csi.measure_type, csi.label_bind + + + SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo, + bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong, + bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime" + FROM + ( + SELECT * + FROM business_order bo + WHERE bo.is_del = 0 + + AND bo.require_over_time < NOW() + + + AND bo.order_code LIKE concat('%',#{request.orderNo},'%') + + + AND bo.customer_no LIKE concat('%',#{request.customerNo},'%') + + + AND bo.customer_name LIKE concat('%',#{request.customerName},'%') + + + AND bo.require_over_time <= #{request.startTime} + + + AND bo.require_over_time > #{request.endTime} + + + AND bo.is_urgent = #{request.isUrgent} + + ) bo + JOIN + ( + SELECT * + FROM business_order_sample_relation bosr + WHERE 1=1 + + (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) + + + (bosr.sample_status = 2 OR bosr.sample_status = 3) + + + AND bosr.sample_status = #{request.sampleStatus} + + ) bosr ON bo.id = bosr.order_id + JOIN ( + SELECT * + FROM customer_sample_info + WHERE is_del=0 + + AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') + + + AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') + + + AND csi.sample_belong = #{request.sampleBelong} + + ) csi ON csi.id = bosr.sample_id + + + SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo, + bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong, + bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime" + FROM + ( + SELECT * + FROM business_order bo + WHERE bo.is_del = 0 + + AND bo.require_over_time < NOW() + + + AND bo.order_code LIKE concat('%',#{request.orderNo},'%') + + + AND bo.customer_no LIKE concat('%',#{request.customerNo},'%') + + + AND bo.customer_name LIKE concat('%',#{request.customerName},'%') + + + AND bo.require_over_time <= #{request.startTime} + + + AND bo.require_over_time > #{request.endTime} + + + AND bo.is_urgent = #{request.isUrgent} + + ) bo + JOIN + ( + SELECT * + FROM business_order_sample_relation bosr + WHERE 1=1 + + (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) + + + (bosr.sample_status = 2 OR bosr.sample_status = 3) + + + AND bosr.sample_status = #{request.sampleStatus} + + ) bosr ON bo.id = bosr.order_id + JOIN ( + SELECT * + FROM customer_sample_info + WHERE is_del=0 + + AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') + + + AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') + + + AND csi.sample_belong = #{request.sampleBelong} + + ) csi ON csi.id = bosr.sample_id + + + SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo, + bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong, + bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime" + FROM + ( + SELECT * + FROM business_order bo + WHERE bo.is_del = 0 + + AND bo.require_over_time < NOW() + + + AND bo.order_code LIKE concat('%',#{request.orderNo},'%') + + + AND bo.customer_no LIKE concat('%',#{request.customerNo},'%') + + + AND bo.customer_name LIKE concat('%',#{request.customerName},'%') + + + AND bo.require_over_time <= #{request.startTime} + + + AND bo.require_over_time > #{request.endTime} + + + AND bo.is_urgent = #{request.isUrgent} + + ) bo + JOIN + ( + SELECT * + FROM business_order_sample_relation bosr + WHERE 1=1 + + (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) + + + (bosr.sample_status = 2 OR bosr.sample_status = 3) + + + AND bosr.sample_status = #{request.sampleStatus} + + ) bosr ON bo.id = bosr.order_id + JOIN ( + SELECT * + FROM customer_sample_info + WHERE is_del=0 + + AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') + + + AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') + + + AND csi.sample_belong = #{request.sampleBelong} + + ) csi ON csi.id = bosr.sample_id + + + SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo, + bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong, + bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime" + FROM + ( + SELECT * + FROM business_order bo + WHERE bo.is_del = 0 + + AND bo.require_over_time < NOW() + + + AND bo.order_code LIKE concat('%',#{request.orderNo},'%') + + + AND bo.customer_no LIKE concat('%',#{request.customerNo},'%') + + + AND bo.customer_name LIKE concat('%',#{request.customerName},'%') + + + AND bo.require_over_time <= #{request.startTime} + + + AND bo.require_over_time > #{request.endTime} + + + AND bo.is_urgent = #{request.isUrgent} + + ) bo + JOIN + ( + SELECT * + FROM business_order_sample_relation bosr + WHERE 1=1 + + (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) + + + (bosr.sample_status = 2 OR bosr.sample_status = 3) + + + AND bosr.sample_status = #{request.sampleStatus} + + ) bosr ON bo.id = bosr.order_id + JOIN ( + SELECT * + FROM customer_sample_info + WHERE is_del=0 + + AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') + + + AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') + + + AND csi.sample_belong = #{request.sampleBelong} + + ) csi ON csi.id = bosr.sample_id + + + SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo, + bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong, + bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime" + FROM + ( + SELECT * + FROM business_order bo + WHERE bo.is_del = 0 + + AND bo.require_over_time < NOW() + + + AND bo.order_code LIKE concat('%',#{request.orderNo},'%') + + + AND bo.customer_no LIKE concat('%',#{request.customerNo},'%') + + + AND bo.customer_name LIKE concat('%',#{request.customerName},'%') + + + AND bo.require_over_time <= #{request.startTime} + + + AND bo.require_over_time > #{request.endTime} + + + AND bo.is_urgent = #{request.isUrgent} + + ) bo + JOIN + ( + SELECT * + FROM business_order_sample_relation bosr + WHERE 1=1 + + (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) + + + (bosr.sample_status = 2 OR bosr.sample_status = 3) + + + AND bosr.sample_status = #{request.sampleStatus} + + ) bosr ON bo.id = bosr.order_id + JOIN ( + SELECT * + FROM customer_sample_info + WHERE is_del=0 + + AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') + + + AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') + + + AND csi.sample_belong = #{request.sampleBelong} + + ) csi ON csi.id = bosr.sample_id + + + SELECT csi.id AS sample_id, csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code AS orderNo, + bo.id AS orderId,bo.customer_id,bo.customer_name,bo.deliverer,bo.is_urgent,csi.sample_belong, + bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime" + FROM + ( + SELECT * + FROM business_order bo + WHERE bo.is_del = 0 + + AND bo.require_over_time < NOW() + + + AND bo.order_code LIKE concat('%',#{request.orderNo},'%') + + + AND bo.customer_no LIKE concat('%',#{request.customerNo},'%') + + + AND bo.customer_name LIKE concat('%',#{request.customerName},'%') + + + AND bo.require_over_time <= #{request.startTime} + + + AND bo.require_over_time > #{request.endTime} + + + AND bo.is_urgent = #{request.isUrgent} + + ) bo + JOIN + ( + SELECT * + FROM business_order_sample_relation bosr + WHERE 1=1 + + (bosr.sample_status = 2 OR bosr.sample_status = 3 OR bosr.sample_status = 4 ) + + + (bosr.sample_status = 2 OR bosr.sample_status = 3) + + + AND bosr.sample_status = #{request.sampleStatus} + + ) bosr ON bo.id = bosr.order_id + JOIN ( + SELECT * + FROM customer_sample_info + WHERE is_del=0 + + AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') + + + AND csi.sample_name LIKE concat('%',#{request.sampleName},'%') + + + AND csi.sample_belong = #{request.sampleBelong} + + ) csi ON csi.id = bosr.sample_id + +