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 7892868..235c95f 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 @@ -8,9 +8,12 @@ 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.dto.customer.sample.CustomerSampleListVO; import com.casic.missiles.model.business.BusinessOrderSampleRelation; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** *

* 委托书-样品库关联表 Mapper 接口 @@ -28,4 +31,6 @@ SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request); int updateByOrderIdAndSampleId(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId, @Param("status") String status); + + CustomerSampleListVO getInterChangeSampleList(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } 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 7892868..235c95f 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 @@ -8,9 +8,12 @@ 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.dto.customer.sample.CustomerSampleListVO; import com.casic.missiles.model.business.BusinessOrderSampleRelation; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** *

* 委托书-样品库关联表 Mapper 接口 @@ -28,4 +31,6 @@ SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request); int updateByOrderIdAndSampleId(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId, @Param("status") String status); + + CustomerSampleListVO getInterChangeSampleList(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index 83802df..54dc0f3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -47,8 +47,12 @@ AND reciever=#{request.reciever} - - AND deliver_time=#{request.deliverTime} + + + AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') ) bif JOIN ( 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 7892868..235c95f 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 @@ -8,9 +8,12 @@ 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.dto.customer.sample.CustomerSampleListVO; import com.casic.missiles.model.business.BusinessOrderSampleRelation; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** *

* 委托书-样品库关联表 Mapper 接口 @@ -28,4 +31,6 @@ SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request); int updateByOrderIdAndSampleId(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId, @Param("status") String status); + + CustomerSampleListVO getInterChangeSampleList(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index 83802df..54dc0f3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -47,8 +47,12 @@ AND reciever=#{request.reciever} - - AND deliver_time=#{request.deliverTime} + + + AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') ) bif JOIN ( 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 bb789a7..99e19d2 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -149,4 +149,22 @@ SET sample_status = #{status} WHERE order_id = #{orderId} AND sample_id = #{sampleId} + + + + 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 7892868..235c95f 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 @@ -8,9 +8,12 @@ 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.dto.customer.sample.CustomerSampleListVO; import com.casic.missiles.model.business.BusinessOrderSampleRelation; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** *

* 委托书-样品库关联表 Mapper 接口 @@ -28,4 +31,6 @@ SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request); int updateByOrderIdAndSampleId(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId, @Param("status") String status); + + CustomerSampleListVO getInterChangeSampleList(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index 83802df..54dc0f3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -47,8 +47,12 @@ AND reciever=#{request.reciever} - - AND deliver_time=#{request.deliverTime} + + + AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') ) bif JOIN ( 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 bb789a7..99e19d2 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -149,4 +149,22 @@ SET sample_status = #{status} WHERE order_id = #{orderId} AND sample_id = #{sampleId} + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java index 9abb575..7632b98 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java @@ -4,6 +4,8 @@ import lombok.Data; import lombok.NonNull; +import java.util.List; + @Data public class DeviceDispatchDTO { @@ -32,6 +34,12 @@ @ApiModelProperty(value = "开始时间", dataType = "String") private String startTime; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "结束时间", dataType = "String") private String endTime; 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 7892868..235c95f 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 @@ -8,9 +8,12 @@ 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.dto.customer.sample.CustomerSampleListVO; import com.casic.missiles.model.business.BusinessOrderSampleRelation; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** *

* 委托书-样品库关联表 Mapper 接口 @@ -28,4 +31,6 @@ SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request); int updateByOrderIdAndSampleId(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId, @Param("status") String status); + + CustomerSampleListVO getInterChangeSampleList(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index 83802df..54dc0f3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -47,8 +47,12 @@ AND reciever=#{request.reciever} - - AND deliver_time=#{request.deliverTime} + + + AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') ) bif JOIN ( 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 bb789a7..99e19d2 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -149,4 +149,22 @@ SET sample_status = #{status} WHERE order_id = #{orderId} AND sample_id = #{sampleId} + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java index 9abb575..7632b98 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java @@ -4,6 +4,8 @@ import lombok.Data; import lombok.NonNull; +import java.util.List; + @Data public class DeviceDispatchDTO { @@ -32,6 +34,12 @@ @ApiModelProperty(value = "开始时间", dataType = "String") private String startTime; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "结束时间", dataType = "String") private String endTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java index fd355a3..01901d5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java @@ -32,7 +32,9 @@ @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") private List ids; - @ApiModelProperty(value = "交接时间", dataType = "String") - private String deliverTime; + @ApiModelProperty(value = "交接开始时间", dataType = "String") + private String startTime; + @ApiModelProperty(value = "交接结束时间", dataType = "String") + private String endTime; } 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 7892868..235c95f 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 @@ -8,9 +8,12 @@ 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.dto.customer.sample.CustomerSampleListVO; import com.casic.missiles.model.business.BusinessOrderSampleRelation; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** *

* 委托书-样品库关联表 Mapper 接口 @@ -28,4 +31,6 @@ SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request); int updateByOrderIdAndSampleId(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId, @Param("status") String status); + + CustomerSampleListVO getInterChangeSampleList(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index 83802df..54dc0f3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -47,8 +47,12 @@ AND reciever=#{request.reciever} - - AND deliver_time=#{request.deliverTime} + + + AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') ) bif JOIN ( 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 bb789a7..99e19d2 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -149,4 +149,22 @@ SET sample_status = #{status} WHERE order_id = #{orderId} AND sample_id = #{sampleId} + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java index 9abb575..7632b98 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java @@ -4,6 +4,8 @@ import lombok.Data; import lombok.NonNull; +import java.util.List; + @Data public class DeviceDispatchDTO { @@ -32,6 +34,12 @@ @ApiModelProperty(value = "开始时间", dataType = "String") private String startTime; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "结束时间", dataType = "String") private String endTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java index fd355a3..01901d5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java @@ -32,7 +32,9 @@ @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") private List ids; - @ApiModelProperty(value = "交接时间", dataType = "String") - private String deliverTime; + @ApiModelProperty(value = "交接开始时间", dataType = "String") + private String startTime; + @ApiModelProperty(value = "交接结束时间", dataType = "String") + private String endTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java index a50acea..8c16d66 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java @@ -49,18 +49,15 @@ private String deliverTime; @ApiModelProperty(value = "委托书编号", dataType = "String") - @ExcelProperty(value = "委托书编号",order = 6) private String orderNo; @ApiModelProperty(value = "要求捡完时间", dataType = "String") - @ExcelProperty(value = "要求捡完时间",order = 7) private String requireOverTime; //委托书中自带 @ApiModelProperty(value = "是否加急", dataType = "String") - @ExcelProperty(value = "是否加急",order = 8) private String isUrgent; @ApiModelProperty(value = "备注", dataType = "String") - @ExcelProperty(value = "备注",order = 9) + @ExcelProperty(value = "备注",order = 8) private String remark; } 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 7892868..235c95f 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 @@ -8,9 +8,12 @@ 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.dto.customer.sample.CustomerSampleListVO; import com.casic.missiles.model.business.BusinessOrderSampleRelation; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** *

* 委托书-样品库关联表 Mapper 接口 @@ -28,4 +31,6 @@ SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request); int updateByOrderIdAndSampleId(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId, @Param("status") String status); + + CustomerSampleListVO getInterChangeSampleList(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index 83802df..54dc0f3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -47,8 +47,12 @@ AND reciever=#{request.reciever} - - AND deliver_time=#{request.deliverTime} + + + AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') ) bif JOIN ( 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 bb789a7..99e19d2 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -149,4 +149,22 @@ SET sample_status = #{status} WHERE order_id = #{orderId} AND sample_id = #{sampleId} + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java index 9abb575..7632b98 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java @@ -4,6 +4,8 @@ import lombok.Data; import lombok.NonNull; +import java.util.List; + @Data public class DeviceDispatchDTO { @@ -32,6 +34,12 @@ @ApiModelProperty(value = "开始时间", dataType = "String") private String startTime; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "结束时间", dataType = "String") private String endTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java index fd355a3..01901d5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java @@ -32,7 +32,9 @@ @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") private List ids; - @ApiModelProperty(value = "交接时间", dataType = "String") - private String deliverTime; + @ApiModelProperty(value = "交接开始时间", dataType = "String") + private String startTime; + @ApiModelProperty(value = "交接结束时间", dataType = "String") + private String endTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java index a50acea..8c16d66 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java @@ -49,18 +49,15 @@ private String deliverTime; @ApiModelProperty(value = "委托书编号", dataType = "String") - @ExcelProperty(value = "委托书编号",order = 6) private String orderNo; @ApiModelProperty(value = "要求捡完时间", dataType = "String") - @ExcelProperty(value = "要求捡完时间",order = 7) private String requireOverTime; //委托书中自带 @ApiModelProperty(value = "是否加急", dataType = "String") - @ExcelProperty(value = "是否加急",order = 8) private String isUrgent; @ApiModelProperty(value = "备注", dataType = "String") - @ExcelProperty(value = "备注",order = 9) + @ExcelProperty(value = "备注",order = 8) private String remark; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java new file mode 100644 index 0000000..71fac7e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java @@ -0,0 +1,32 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * VO模型 + */ +@Data +@ApiModel("设备交接单样品接收列表") +public class CustomerSampleListVO { + @ApiModelProperty(value = "委托书id", dataType = "String") + private Long orderId; + @ApiModelProperty(value = "样品id", dataType = "String") + private Long smapleId; + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + @ApiModelProperty(value = "是否存库", dataType = "Integer") + private Integer isExistSample; + @ApiModelProperty(value = "附件说明", dataType = "String") + private String appendixDescn; + @ApiModelProperty(value = "检定要求", dataType = "Integer") + private String measureRequire; + @ApiModelProperty(value = "外观", dataType = "String") + private String appearance; + +} 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 7892868..235c95f 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 @@ -8,9 +8,12 @@ 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.dto.customer.sample.CustomerSampleListVO; import com.casic.missiles.model.business.BusinessOrderSampleRelation; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** *

* 委托书-样品库关联表 Mapper 接口 @@ -28,4 +31,6 @@ SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request); int updateByOrderIdAndSampleId(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId, @Param("status") String status); + + CustomerSampleListVO getInterChangeSampleList(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index 83802df..54dc0f3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -47,8 +47,12 @@ AND reciever=#{request.reciever} - - AND deliver_time=#{request.deliverTime} + + + AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') ) bif JOIN ( 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 bb789a7..99e19d2 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -149,4 +149,22 @@ SET sample_status = #{status} WHERE order_id = #{orderId} AND sample_id = #{sampleId} + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java index 9abb575..7632b98 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java @@ -4,6 +4,8 @@ import lombok.Data; import lombok.NonNull; +import java.util.List; + @Data public class DeviceDispatchDTO { @@ -32,6 +34,12 @@ @ApiModelProperty(value = "开始时间", dataType = "String") private String startTime; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "结束时间", dataType = "String") private String endTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java index fd355a3..01901d5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java @@ -32,7 +32,9 @@ @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") private List ids; - @ApiModelProperty(value = "交接时间", dataType = "String") - private String deliverTime; + @ApiModelProperty(value = "交接开始时间", dataType = "String") + private String startTime; + @ApiModelProperty(value = "交接结束时间", dataType = "String") + private String endTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java index a50acea..8c16d66 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java @@ -49,18 +49,15 @@ private String deliverTime; @ApiModelProperty(value = "委托书编号", dataType = "String") - @ExcelProperty(value = "委托书编号",order = 6) private String orderNo; @ApiModelProperty(value = "要求捡完时间", dataType = "String") - @ExcelProperty(value = "要求捡完时间",order = 7) private String requireOverTime; //委托书中自带 @ApiModelProperty(value = "是否加急", dataType = "String") - @ExcelProperty(value = "是否加急",order = 8) private String isUrgent; @ApiModelProperty(value = "备注", dataType = "String") - @ExcelProperty(value = "备注",order = 9) + @ExcelProperty(value = "备注",order = 8) private String remark; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java new file mode 100644 index 0000000..71fac7e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java @@ -0,0 +1,32 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * VO模型 + */ +@Data +@ApiModel("设备交接单样品接收列表") +public class CustomerSampleListVO { + @ApiModelProperty(value = "委托书id", dataType = "String") + private Long orderId; + @ApiModelProperty(value = "样品id", dataType = "String") + private Long smapleId; + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + @ApiModelProperty(value = "是否存库", dataType = "Integer") + private Integer isExistSample; + @ApiModelProperty(value = "附件说明", dataType = "String") + private String appendixDescn; + @ApiModelProperty(value = "检定要求", dataType = "Integer") + private String measureRequire; + @ApiModelProperty(value = "外观", dataType = "String") + private String appearance; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java index f751625..672e1d4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.dto.customer.sample.CustomerSampleListVO; import com.casic.missiles.model.customer.CustomerSampleInfo; import lombok.Data; @@ -153,5 +154,5 @@ private String updateTime; @TableField(exist = false) - private List customerSampleInfoList; + private List customerSampleList; } 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 7892868..235c95f 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 @@ -8,9 +8,12 @@ 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.dto.customer.sample.CustomerSampleListVO; import com.casic.missiles.model.business.BusinessOrderSampleRelation; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** *

* 委托书-样品库关联表 Mapper 接口 @@ -28,4 +31,6 @@ SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request); int updateByOrderIdAndSampleId(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId, @Param("status") String status); + + CustomerSampleListVO getInterChangeSampleList(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index 83802df..54dc0f3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -47,8 +47,12 @@ AND reciever=#{request.reciever} - - AND deliver_time=#{request.deliverTime} + + + AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') ) bif JOIN ( 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 bb789a7..99e19d2 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -149,4 +149,22 @@ SET sample_status = #{status} WHERE order_id = #{orderId} AND sample_id = #{sampleId} + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java index 9abb575..7632b98 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java @@ -4,6 +4,8 @@ import lombok.Data; import lombok.NonNull; +import java.util.List; + @Data public class DeviceDispatchDTO { @@ -32,6 +34,12 @@ @ApiModelProperty(value = "开始时间", dataType = "String") private String startTime; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "结束时间", dataType = "String") private String endTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java index fd355a3..01901d5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java @@ -32,7 +32,9 @@ @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") private List ids; - @ApiModelProperty(value = "交接时间", dataType = "String") - private String deliverTime; + @ApiModelProperty(value = "交接开始时间", dataType = "String") + private String startTime; + @ApiModelProperty(value = "交接结束时间", dataType = "String") + private String endTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java index a50acea..8c16d66 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java @@ -49,18 +49,15 @@ private String deliverTime; @ApiModelProperty(value = "委托书编号", dataType = "String") - @ExcelProperty(value = "委托书编号",order = 6) private String orderNo; @ApiModelProperty(value = "要求捡完时间", dataType = "String") - @ExcelProperty(value = "要求捡完时间",order = 7) private String requireOverTime; //委托书中自带 @ApiModelProperty(value = "是否加急", dataType = "String") - @ExcelProperty(value = "是否加急",order = 8) private String isUrgent; @ApiModelProperty(value = "备注", dataType = "String") - @ExcelProperty(value = "备注",order = 9) + @ExcelProperty(value = "备注",order = 8) private String remark; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java new file mode 100644 index 0000000..71fac7e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java @@ -0,0 +1,32 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * VO模型 + */ +@Data +@ApiModel("设备交接单样品接收列表") +public class CustomerSampleListVO { + @ApiModelProperty(value = "委托书id", dataType = "String") + private Long orderId; + @ApiModelProperty(value = "样品id", dataType = "String") + private Long smapleId; + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + @ApiModelProperty(value = "是否存库", dataType = "Integer") + private Integer isExistSample; + @ApiModelProperty(value = "附件说明", dataType = "String") + private String appendixDescn; + @ApiModelProperty(value = "检定要求", dataType = "Integer") + private String measureRequire; + @ApiModelProperty(value = "外观", dataType = "String") + private String appearance; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java index f751625..672e1d4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.dto.customer.sample.CustomerSampleListVO; import com.casic.missiles.model.customer.CustomerSampleInfo; import lombok.Data; @@ -153,5 +154,5 @@ private String updateTime; @TableField(exist = false) - private List customerSampleInfoList; + private List customerSampleList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java index d5bcdbc..386d73d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -25,7 +25,6 @@ private Long id; - /** * 委托书id */ @@ -73,4 +72,12 @@ @TableField("update_time") private String updateTime; + //检定要求 + @TableField("measure_require") + private String measureRequire; + + //外观 + @TableField("appearance") + private String appearance; + } 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 7892868..235c95f 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 @@ -8,9 +8,12 @@ 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.dto.customer.sample.CustomerSampleListVO; import com.casic.missiles.model.business.BusinessOrderSampleRelation; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** *

* 委托书-样品库关联表 Mapper 接口 @@ -28,4 +31,6 @@ SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request); int updateByOrderIdAndSampleId(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId, @Param("status") String status); + + CustomerSampleListVO getInterChangeSampleList(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index 83802df..54dc0f3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -47,8 +47,12 @@ AND reciever=#{request.reciever} - - AND deliver_time=#{request.deliverTime} + + + AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') ) bif JOIN ( 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 bb789a7..99e19d2 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -149,4 +149,22 @@ SET sample_status = #{status} WHERE order_id = #{orderId} AND sample_id = #{sampleId} + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java index 9abb575..7632b98 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java @@ -4,6 +4,8 @@ import lombok.Data; import lombok.NonNull; +import java.util.List; + @Data public class DeviceDispatchDTO { @@ -32,6 +34,12 @@ @ApiModelProperty(value = "开始时间", dataType = "String") private String startTime; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "结束时间", dataType = "String") private String endTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java index fd355a3..01901d5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java @@ -32,7 +32,9 @@ @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") private List ids; - @ApiModelProperty(value = "交接时间", dataType = "String") - private String deliverTime; + @ApiModelProperty(value = "交接开始时间", dataType = "String") + private String startTime; + @ApiModelProperty(value = "交接结束时间", dataType = "String") + private String endTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java index a50acea..8c16d66 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java @@ -49,18 +49,15 @@ private String deliverTime; @ApiModelProperty(value = "委托书编号", dataType = "String") - @ExcelProperty(value = "委托书编号",order = 6) private String orderNo; @ApiModelProperty(value = "要求捡完时间", dataType = "String") - @ExcelProperty(value = "要求捡完时间",order = 7) private String requireOverTime; //委托书中自带 @ApiModelProperty(value = "是否加急", dataType = "String") - @ExcelProperty(value = "是否加急",order = 8) private String isUrgent; @ApiModelProperty(value = "备注", dataType = "String") - @ExcelProperty(value = "备注",order = 9) + @ExcelProperty(value = "备注",order = 8) private String remark; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java new file mode 100644 index 0000000..71fac7e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java @@ -0,0 +1,32 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * VO模型 + */ +@Data +@ApiModel("设备交接单样品接收列表") +public class CustomerSampleListVO { + @ApiModelProperty(value = "委托书id", dataType = "String") + private Long orderId; + @ApiModelProperty(value = "样品id", dataType = "String") + private Long smapleId; + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + @ApiModelProperty(value = "是否存库", dataType = "Integer") + private Integer isExistSample; + @ApiModelProperty(value = "附件说明", dataType = "String") + private String appendixDescn; + @ApiModelProperty(value = "检定要求", dataType = "Integer") + private String measureRequire; + @ApiModelProperty(value = "外观", dataType = "String") + private String appearance; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java index f751625..672e1d4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.dto.customer.sample.CustomerSampleListVO; import com.casic.missiles.model.customer.CustomerSampleInfo; import lombok.Data; @@ -153,5 +154,5 @@ private String updateTime; @TableField(exist = false) - private List customerSampleInfoList; + private List customerSampleList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java index d5bcdbc..386d73d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -25,7 +25,6 @@ private Long id; - /** * 委托书id */ @@ -73,4 +72,12 @@ @TableField("update_time") private String updateTime; + //检定要求 + @TableField("measure_require") + private String measureRequire; + + //外观 + @TableField("appearance") + private String appearance; + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java index ed9ef9b..49370a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -12,6 +12,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; import com.casic.missiles.dto.business.interchange.InterchangeListResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListVO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; @@ -25,6 +26,7 @@ import com.casic.missiles.service.customer.CustomerSampleService; import com.casic.missiles.utils.NumberGeneratorUtil; import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -63,22 +65,19 @@ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("order_id", businessExchange.getOrderId()); List orderSampleList = sampleRelationMapper.selectList(queryWrapper); - List customerSampleList = new ArrayList<>(); - for (BusinessOrderSampleRelation orderSample : orderSampleList) { - CustomerSampleInfo customerSampleInfo = customerSampleService.sampleDetail(orderSample.getSampleId()); - customerSampleInfo.setIsExistSample("1"); - customerSampleList.add(customerSampleInfo); + List customerSampleList = new ArrayList<>(); + for(BusinessOrderSampleRelation businessOrderSampleRelation:orderSampleList ){ + CustomerSampleListVO customerSampleListVO=sampleRelationMapper.getInterChangeSampleList(businessOrderSampleRelation.getOrderId(),businessOrderSampleRelation.getSampleId()); + customerSampleList.add(customerSampleListVO); } - businessExchange.setCustomerSampleInfoList(customerSampleList); + businessExchange.setCustomerSampleList(customerSampleList); return businessExchange; } @Override public ReturnDTO deleteExchange(Long id) { - BusinessInterchange businessInterchange = this.baseMapper.selectById(id); Integer deleteFlag = this.baseMapper.deleteById(id); - Boolean sampleUpdateFlag = sampleStatusDeletor(businessInterchange.getOrderId(), "1") > 0; - if (deleteFlag > 0 && sampleUpdateFlag) { + if (deleteFlag > 0 ) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -88,9 +87,9 @@ public ReturnDTO updateExchange(BusinessInterchange businessInterchange) { Integer updateFlag = this.baseMapper.updateById(businessInterchange); Boolean samplUpdateFlag = true; - if (!CollectionUtils.isEmpty(businessInterchange.getCustomerSampleInfoList())) { - for (CustomerSampleInfo sampleInfo : businessInterchange.getCustomerSampleInfoList()) { - samplUpdateFlag = samplUpdateFlag && sampleStatusUpdator(sampleInfo, businessInterchange.getOrderId()) > 0; + if (!CollectionUtils.isEmpty(businessInterchange.getCustomerSampleList())) { + for (CustomerSampleListVO sampleInfo : businessInterchange.getCustomerSampleList()) { + samplUpdateFlag = samplUpdateFlag && sampleStatusUpdator(sampleInfo) > 0; } } if (updateFlag > 0 && samplUpdateFlag) { @@ -102,12 +101,11 @@ @Override public ReturnDTO addExchange(BusinessInterchange businessInterchange) { populationExchange(businessInterchange); - Integer addFlag = this.baseMapper.insert(businessInterchange); Boolean sampleAddFlag = true; - if (!CollectionUtils.isEmpty(businessInterchange.getCustomerSampleInfoList())) { - for (CustomerSampleInfo sampleInfo : businessInterchange.getCustomerSampleInfoList()) { - sampleAddFlag = sampleAddFlag && sampleStatusCreator(businessInterchange.getOrderId(), sampleInfo.getId(), "2") > 0; + if (!CollectionUtils.isEmpty(businessInterchange.getCustomerSampleList())) { + for (CustomerSampleListVO sampleInfo : businessInterchange.getCustomerSampleList()) { + sampleAddFlag = sampleAddFlag && sampleStatusUpdator(sampleInfo) > 0; } } if (addFlag > 0 && sampleAddFlag) { @@ -143,33 +141,13 @@ businessInterchange.setInterchangeCode(orderNo); } - private Integer sampleStatusCreator(Long orderId, Long sampleId, String status) { + private Integer sampleStatusUpdator(CustomerSampleListVO sampleVO) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("order_id", orderId); - queryWrapper.eq(ObjectUtil.isEmpty(sampleId), "sample_id", sampleId); + queryWrapper.eq("order_id", sampleVO.getOrderId()); + queryWrapper.eq(ObjectUtil.isEmpty(sampleVO.getSmapleId()), "sample_id", sampleVO.getSmapleId()); BusinessOrderSampleRelation sampleStatusPopulation = new BusinessOrderSampleRelation(); - sampleStatusPopulation.setSampleStatus(status); - Integer sampleStatus = this.sampleRelationMapper.update(sampleStatusPopulation, queryWrapper); - return sampleStatus; - } - - private Integer sampleStatusUpdator(CustomerSampleInfo customerSampleInfo,Long orderId) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("order_id",orderId); - queryWrapper.eq(ObjectUtil.isEmpty(customerSampleInfo.getId()), "id", customerSampleInfo.getId()); - BusinessOrderSampleRelation sampleStatusPopulation = new BusinessOrderSampleRelation(); -// sampleStatusPopulation.setSampleStatus(status); -// sampleStatusPopulation.setSampleStatus(status); - Integer sampleStatus = this.sampleRelationMapper.update(sampleStatusPopulation, queryWrapper); - return sampleStatus; - } - - private Integer sampleStatusDeletor(Long orderId, String status) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(ObjectUtil.isNotEmpty(orderId), "order_id", orderId); - queryWrapper.eq("status", "2"); - BusinessOrderSampleRelation sampleStatusPopulation = new BusinessOrderSampleRelation(); - sampleStatusPopulation.setSampleStatus(status); + sampleStatusPopulation.setAppearance(sampleVO.getAppearance()); + sampleStatusPopulation.setMeasureRequire(sampleVO.getMeasureRequire()); Integer sampleStatus = this.sampleRelationMapper.update(sampleStatusPopulation, queryWrapper); return sampleStatus; } 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 7892868..235c95f 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 @@ -8,9 +8,12 @@ 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.dto.customer.sample.CustomerSampleListVO; import com.casic.missiles.model.business.BusinessOrderSampleRelation; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** *

* 委托书-样品库关联表 Mapper 接口 @@ -28,4 +31,6 @@ SampleHandOutDetailResponse selectSampleDetail(@Param("request") SampleHandOutDetailRequest request); int updateByOrderIdAndSampleId(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId, @Param("status") String status); + + CustomerSampleListVO getInterChangeSampleList(@Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml index 83802df..54dc0f3 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -47,8 +47,12 @@ AND reciever=#{request.reciever} - - AND deliver_time=#{request.deliverTime} + + + AND #{request.startTime} DATE_FORMAT(deliver_time,'%Y-%m-%d') + + + AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') ) bif JOIN ( 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 bb789a7..99e19d2 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -149,4 +149,22 @@ SET sample_status = #{status} WHERE order_id = #{orderId} AND sample_id = #{sampleId} + + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java index 9abb575..7632b98 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/DeviceDispatchDTO.java @@ -4,6 +4,8 @@ import lombok.Data; import lombok.NonNull; +import java.util.List; + @Data public class DeviceDispatchDTO { @@ -32,6 +34,12 @@ @ApiModelProperty(value = "开始时间", dataType = "String") private String startTime; + /** + * 导出ids + */ + @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") + private List ids; + @ApiModelProperty(value = "结束时间", dataType = "String") private String endTime; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java index fd355a3..01901d5 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListRequest.java @@ -32,7 +32,9 @@ @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") private List ids; - @ApiModelProperty(value = "交接时间", dataType = "String") - private String deliverTime; + @ApiModelProperty(value = "交接开始时间", dataType = "String") + private String startTime; + @ApiModelProperty(value = "交接结束时间", dataType = "String") + private String endTime; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java index a50acea..8c16d66 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/interchange/InterchangeListResponse.java @@ -49,18 +49,15 @@ private String deliverTime; @ApiModelProperty(value = "委托书编号", dataType = "String") - @ExcelProperty(value = "委托书编号",order = 6) private String orderNo; @ApiModelProperty(value = "要求捡完时间", dataType = "String") - @ExcelProperty(value = "要求捡完时间",order = 7) private String requireOverTime; //委托书中自带 @ApiModelProperty(value = "是否加急", dataType = "String") - @ExcelProperty(value = "是否加急",order = 8) private String isUrgent; @ApiModelProperty(value = "备注", dataType = "String") - @ExcelProperty(value = "备注",order = 9) + @ExcelProperty(value = "备注",order = 8) private String remark; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java new file mode 100644 index 0000000..71fac7e --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/customer/sample/CustomerSampleListVO.java @@ -0,0 +1,32 @@ +package com.casic.missiles.dto.customer.sample; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * VO模型 + */ +@Data +@ApiModel("设备交接单样品接收列表") +public class CustomerSampleListVO { + @ApiModelProperty(value = "委托书id", dataType = "String") + private Long orderId; + @ApiModelProperty(value = "样品id", dataType = "String") + private Long smapleId; + @ApiModelProperty(value = "样品名称", dataType = "String") + private String sampleName; + @ApiModelProperty(value = "样品型号", dataType = "String") + private String sampleModel; + @ApiModelProperty(value = "出厂编号", dataType = "String") + private String manufacturingNo; + @ApiModelProperty(value = "是否存库", dataType = "Integer") + private Integer isExistSample; + @ApiModelProperty(value = "附件说明", dataType = "String") + private String appendixDescn; + @ApiModelProperty(value = "检定要求", dataType = "Integer") + private String measureRequire; + @ApiModelProperty(value = "外观", dataType = "String") + private String appearance; + +} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java index f751625..672e1d4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessInterchange.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.dto.customer.sample.CustomerSampleListVO; import com.casic.missiles.model.customer.CustomerSampleInfo; import lombok.Data; @@ -153,5 +154,5 @@ private String updateTime; @TableField(exist = false) - private List customerSampleInfoList; + private List customerSampleList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java index d5bcdbc..386d73d 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessOrderSampleRelation.java @@ -25,7 +25,6 @@ private Long id; - /** * 委托书id */ @@ -73,4 +72,12 @@ @TableField("update_time") private String updateTime; + //检定要求 + @TableField("measure_require") + private String measureRequire; + + //外观 + @TableField("appearance") + private String appearance; + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java index ed9ef9b..49370a8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessInterchangeServiceImpl.java @@ -12,6 +12,7 @@ import com.casic.missiles.dto.ReturnUtil; import com.casic.missiles.dto.business.interchange.InterchangeListRequest; import com.casic.missiles.dto.business.interchange.InterchangeListResponse; +import com.casic.missiles.dto.customer.sample.CustomerSampleListVO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; @@ -25,6 +26,7 @@ import com.casic.missiles.service.customer.CustomerSampleService; import com.casic.missiles.utils.NumberGeneratorUtil; import lombok.AllArgsConstructor; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -63,22 +65,19 @@ QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("order_id", businessExchange.getOrderId()); List orderSampleList = sampleRelationMapper.selectList(queryWrapper); - List customerSampleList = new ArrayList<>(); - for (BusinessOrderSampleRelation orderSample : orderSampleList) { - CustomerSampleInfo customerSampleInfo = customerSampleService.sampleDetail(orderSample.getSampleId()); - customerSampleInfo.setIsExistSample("1"); - customerSampleList.add(customerSampleInfo); + List customerSampleList = new ArrayList<>(); + for(BusinessOrderSampleRelation businessOrderSampleRelation:orderSampleList ){ + CustomerSampleListVO customerSampleListVO=sampleRelationMapper.getInterChangeSampleList(businessOrderSampleRelation.getOrderId(),businessOrderSampleRelation.getSampleId()); + customerSampleList.add(customerSampleListVO); } - businessExchange.setCustomerSampleInfoList(customerSampleList); + businessExchange.setCustomerSampleList(customerSampleList); return businessExchange; } @Override public ReturnDTO deleteExchange(Long id) { - BusinessInterchange businessInterchange = this.baseMapper.selectById(id); Integer deleteFlag = this.baseMapper.deleteById(id); - Boolean sampleUpdateFlag = sampleStatusDeletor(businessInterchange.getOrderId(), "1") > 0; - if (deleteFlag > 0 && sampleUpdateFlag) { + if (deleteFlag > 0 ) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -88,9 +87,9 @@ public ReturnDTO updateExchange(BusinessInterchange businessInterchange) { Integer updateFlag = this.baseMapper.updateById(businessInterchange); Boolean samplUpdateFlag = true; - if (!CollectionUtils.isEmpty(businessInterchange.getCustomerSampleInfoList())) { - for (CustomerSampleInfo sampleInfo : businessInterchange.getCustomerSampleInfoList()) { - samplUpdateFlag = samplUpdateFlag && sampleStatusUpdator(sampleInfo, businessInterchange.getOrderId()) > 0; + if (!CollectionUtils.isEmpty(businessInterchange.getCustomerSampleList())) { + for (CustomerSampleListVO sampleInfo : businessInterchange.getCustomerSampleList()) { + samplUpdateFlag = samplUpdateFlag && sampleStatusUpdator(sampleInfo) > 0; } } if (updateFlag > 0 && samplUpdateFlag) { @@ -102,12 +101,11 @@ @Override public ReturnDTO addExchange(BusinessInterchange businessInterchange) { populationExchange(businessInterchange); - Integer addFlag = this.baseMapper.insert(businessInterchange); Boolean sampleAddFlag = true; - if (!CollectionUtils.isEmpty(businessInterchange.getCustomerSampleInfoList())) { - for (CustomerSampleInfo sampleInfo : businessInterchange.getCustomerSampleInfoList()) { - sampleAddFlag = sampleAddFlag && sampleStatusCreator(businessInterchange.getOrderId(), sampleInfo.getId(), "2") > 0; + if (!CollectionUtils.isEmpty(businessInterchange.getCustomerSampleList())) { + for (CustomerSampleListVO sampleInfo : businessInterchange.getCustomerSampleList()) { + sampleAddFlag = sampleAddFlag && sampleStatusUpdator(sampleInfo) > 0; } } if (addFlag > 0 && sampleAddFlag) { @@ -143,33 +141,13 @@ businessInterchange.setInterchangeCode(orderNo); } - private Integer sampleStatusCreator(Long orderId, Long sampleId, String status) { + private Integer sampleStatusUpdator(CustomerSampleListVO sampleVO) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("order_id", orderId); - queryWrapper.eq(ObjectUtil.isEmpty(sampleId), "sample_id", sampleId); + queryWrapper.eq("order_id", sampleVO.getOrderId()); + queryWrapper.eq(ObjectUtil.isEmpty(sampleVO.getSmapleId()), "sample_id", sampleVO.getSmapleId()); BusinessOrderSampleRelation sampleStatusPopulation = new BusinessOrderSampleRelation(); - sampleStatusPopulation.setSampleStatus(status); - Integer sampleStatus = this.sampleRelationMapper.update(sampleStatusPopulation, queryWrapper); - return sampleStatus; - } - - private Integer sampleStatusUpdator(CustomerSampleInfo customerSampleInfo,Long orderId) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("order_id",orderId); - queryWrapper.eq(ObjectUtil.isEmpty(customerSampleInfo.getId()), "id", customerSampleInfo.getId()); - BusinessOrderSampleRelation sampleStatusPopulation = new BusinessOrderSampleRelation(); -// sampleStatusPopulation.setSampleStatus(status); -// sampleStatusPopulation.setSampleStatus(status); - Integer sampleStatus = this.sampleRelationMapper.update(sampleStatusPopulation, queryWrapper); - return sampleStatus; - } - - private Integer sampleStatusDeletor(Long orderId, String status) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(ObjectUtil.isNotEmpty(orderId), "order_id", orderId); - queryWrapper.eq("status", "2"); - BusinessOrderSampleRelation sampleStatusPopulation = new BusinessOrderSampleRelation(); - sampleStatusPopulation.setSampleStatus(status); + sampleStatusPopulation.setAppearance(sampleVO.getAppearance()); + sampleStatusPopulation.setMeasureRequire(sampleVO.getMeasureRequire()); Integer sampleStatus = this.sampleRelationMapper.update(sampleStatusPopulation, queryWrapper); return sampleStatus; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java index 4b54a20..ec04b35 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java @@ -11,6 +11,8 @@ import com.casic.missiles.dto.business.dispatch.DeviceDispatchDTO; import com.casic.missiles.dto.business.dispatch.DeviceDispatchVO; import com.casic.missiles.dto.business.dispatch.DeviceStatusChangeDTO; +import com.casic.missiles.dto.business.interchange.InterchangeListResponse; +import com.casic.missiles.dto.meter.TrainPlanApprovalListResponse; import com.casic.missiles.enums.*; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.sample.CurrentSegmentEnum; @@ -19,12 +21,14 @@ import com.casic.missiles.mapper.business.*; import com.casic.missiles.model.business.*; import com.casic.missiles.service.business.IBusinessDispatchService; +import com.casic.missiles.utils.ConvertUtils; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; +import org.springframework.util.StringUtils; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -52,13 +56,47 @@ if (CollectionUtils.isEmpty(records)) { return new Page<>(); } - dispatchVOPage.getRecords().stream().forEach( + doDispatchVOPagePopution(records, request); + return dispatchVOPage; + } + + + //进行已收入分页的当前环节回填、出具证书回填 + private void doDispatchVOPopulation(DeviceDispatchVO dispatchVO, Long sampleId, Long orderId) { + dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE); + HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId); + Integer measureNumberStatus = labExecutiveInfoMapper.getMeasureNumberStatus(orderId, sampleId); + // + if (!Objects.isNull(handOutLabExecutiveDTO)) { + dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications()); + dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName()); + Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId(); + dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, measureDeptId)); + } else { + dispatchVO.setAlreadyCertifications(0); + dispatchVO.setRequireCertifications(ObjectUtils.isEmpty(measureNumberStatus) ? 0 : measureNumberStatus); + } + if (!ObjectUtils.isEmpty(measureNumberStatus) && measureNumberStatus > 0) { + dispatchVO.setFallbackState(0);//不可以进行回退 + } else { + dispatchVO.setFallbackState(1);//可以进行回退 + } + } + + /** + * 重点填充类 + * + * @param dispatchVOPage + * @param request + */ + private void doDispatchVOPagePopution(List dispatchVOPage, DeviceDispatchDTO request) { + dispatchVOPage.stream().forEach( dispatchVO -> { Long orderId = dispatchVO.getOrderId(); Long sampleId = dispatchVO.getSampleId(); String sampleStatus = dispatchVO.getSampleStatus(); //先过滤超期状态下的外检外包 - if (request.getSampleStatus().equals("8") && noSelfMeasure(dispatchVO)) { + if (!StringUtils.isEmpty(request.getSampleStatus()) && request.getSampleStatus().equals("8") && noSelfMeasure(dispatchVO)) { return; } switch (sampleStatus) { @@ -88,40 +126,25 @@ } } ); - return page; - } - - - //进行已收入分页的当前环节回填、出具证书回填 - private void doDispatchVOPopulation(DeviceDispatchVO dispatchVO, Long sampleId, Long orderId) { - dispatchVO.setCurrentSegment(CurrentSegmentEnum.TO_ALLOCATE); - HandOutLabExecutiveDTO handOutLabExecutiveDTO = getHandOutLabExecutiveDTO(orderId, sampleId); - Integer measureNumberStatus = labExecutiveInfoMapper.getMeasureNumberStatus(orderId, sampleId); - // - if (!Objects.isNull(handOutLabExecutiveDTO)) { - dispatchVO.setRequireCertifications(handOutLabExecutiveDTO.getRequireCertifications()); - dispatchVO.setCurrentSegment(handOutLabExecutiveDTO.getDeptName()); - Long measureDeptId = handOutLabExecutiveDTO.getMeasureDeptId(); - dispatchVO.setAlreadyCertifications(getAlreadyCertificateNum(dispatchVO, measureDeptId)); - } else { - dispatchVO.setAlreadyCertifications(0); - dispatchVO.setRequireCertifications(ObjectUtils.isEmpty(measureNumberStatus) ? 0 : measureNumberStatus); - } - if (!ObjectUtils.isEmpty(measureNumberStatus) && measureNumberStatus > 0) { - dispatchVO.setFallbackState(0);//不可以进行回退 - } else { - dispatchVO.setFallbackState(1);//可以进行回退 - } } @Override public void exportSampleDispatchList(DeviceDispatchDTO request, HttpServletResponse response) { try { - Page page = PageFactory.defaultPage(); - page.setCurrent(1); - page.setSearchCount(false); - page.setSize(Integer.MAX_VALUE); - Page deviceDispatchVOPage = listPage(page, request); + + Page deviceDispatchVOPage = PageFactory.defaultPage(); + if (!CollectionUtils.isEmpty(request.getIds())) { + List orderList = orderSampleRelationMapper.selectBatchIds(request.getIds()); + List deviceDispatchVOList = ConvertUtils.sourceToTarget(orderList, DeviceDispatchVO.class); + doDispatchVOPagePopution(deviceDispatchVOList, request); + deviceDispatchVOPage.setRecords(deviceDispatchVOList); + } else { + Page page = PageFactory.defaultPage(); + page.setCurrent(1); + page.setSearchCount(false); + page.setSize(Integer.MAX_VALUE); + deviceDispatchVOPage = listPage(page, request); + } iBaseExportService.exportExcel(response, DeviceDispatchVO.class, deviceDispatchVOPage.getRecords(), ExportEnum.DISPATCH_DATA.getSheetName()); } catch (Exception e) { log.error("样品导出出现异常，异常信息为{}", e); @@ -130,7 +153,7 @@ @Override public ReturnDTO statusChange(DeviceStatusChangeDTO deviceStatusChangeDTO) { - Integer updateFalg = this.statusChangeUpdator(deviceStatusChangeDTO,false); + Integer updateFalg = this.statusChangeUpdator(deviceStatusChangeDTO, false); if (updateFalg > 0) { return ReturnUtil.success(); } @@ -141,7 +164,7 @@ @Override @Transactional public ReturnDTO forcedTerminate(DeviceStatusChangeDTO deviceStatusChangeDTO) { - Integer updateFlag = this.statusChangeUpdator(deviceStatusChangeDTO,true); + Integer updateFlag = this.statusChangeUpdator(deviceStatusChangeDTO, true); //实验室状态数据的更新 Integer updateReasonFlag = reasonPopulation(deviceStatusChangeDTO); if (updateFlag > 0 && updateReasonFlag > 0) { @@ -193,11 +216,11 @@ } //更新检测完成后，执行当前正在进行数据 - private Integer statusChangeUpdator(DeviceStatusChangeDTO statusChangeDTO,Boolean terminateFlag ) { + private Integer statusChangeUpdator(DeviceStatusChangeDTO statusChangeDTO, Boolean terminateFlag) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("order_id", statusChangeDTO.getOrderId()); queryWrapper.eq("sample_id", statusChangeDTO.getSampleId()); - if(terminateFlag){ + if (terminateFlag) { queryWrapper.eq("sample_status", "2").or().eq("sample_status", "3").or().eq("sample_status", "4"); } BusinessOrderSampleRelation businessOrderSampleRelation = new BusinessOrderSampleRelation();