diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java deleted file mode 100644 index 7f16692..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java +++ /dev/null @@ -1,10 +0,0 @@ - - -package com.casic.missiles.mapper.business; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.business.interchange.InterchangeListResponse; - -public interface BusinessInterchangeListResponseMapper extends BaseMapper { -} - diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java deleted file mode 100644 index 7f16692..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java +++ /dev/null @@ -1,10 +0,0 @@ - - -package com.casic.missiles.mapper.business; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.business.interchange.InterchangeListResponse; - -public interface BusinessInterchangeListResponseMapper extends BaseMapper { -} - diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java index 5ab214c..d00db2e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -24,5 +24,4 @@ Long selectMaxExchangeNo(); - } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java deleted file mode 100644 index 7f16692..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java +++ /dev/null @@ -1,10 +0,0 @@ - - -package com.casic.missiles.mapper.business; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.business.interchange.InterchangeListResponse; - -public interface BusinessInterchangeListResponseMapper extends BaseMapper { -} - diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java index 5ab214c..d00db2e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -24,5 +24,4 @@ Long selectMaxExchangeNo(); - } 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 1086ec8..94760a8 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -35,7 +35,7 @@ SELECT bcr.id,certificate_no AS "certificateNo",bcr.certificate_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",bo.measure_type - AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum",bcr.approval_status AS "approvalStatus" + AS "measureType",bcr.certificate_type AS "certificateType",bcr.print_status AS "printStatus",bcr.print_num AS "printNum",bcr.approval_status AS "approvalStatus", bcr.create_time AS "createTime",measurePersonId FROM ( SELECT * 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 54dc0f3..fd5562c 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessInterchangeMapper.xml @@ -54,6 +54,12 @@ AND #{request.endTime} = ]]> DATE_FORMAT(deliver_time,'%Y-%m-%d') + + and id in + + #{id} + + ) bif JOIN ( SELECT deliverer,customer_no AS "customerNo",customer_name AS "customerName",id as "orderId",is_urgent AS "isUrgent",order_code AS "orderNo",require_over_time AS "requireOverTime" diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java deleted file mode 100644 index 7f16692..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java +++ /dev/null @@ -1,10 +0,0 @@ - - -package com.casic.missiles.mapper.business; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.business.interchange.InterchangeListResponse; - -public interface BusinessInterchangeListResponseMapper extends BaseMapper { -} - diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java index 5ab214c..d00db2e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -24,5 +24,4 @@ Long selectMaxExchangeNo(); - } 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 1086ec8..94760a8 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -35,7 +35,7 @@ - SELECT csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code, + SELECT bosr.id,csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code, bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong, bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime",csi.measure_type AS "measureType" FROM @@ -68,13 +68,19 @@ AND (bosr.sample_status = 2 OR bosr.sample_status = 3) - + AND bosr.sample_status = #{request.sampleStatus} + + and id in + + #{id} + + ) bosr ON bo.id = bosr.order_id JOIN ( SELECT * - FROM customer_sample_info + FROM customer_sample_info csi WHERE is_del=0 AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java deleted file mode 100644 index 7f16692..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java +++ /dev/null @@ -1,10 +0,0 @@ - - -package com.casic.missiles.mapper.business; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.business.interchange.InterchangeListResponse; - -public interface BusinessInterchangeListResponseMapper extends BaseMapper { -} - diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java index 5ab214c..d00db2e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -24,5 +24,4 @@ Long selectMaxExchangeNo(); - } 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 1086ec8..94760a8 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -35,7 +35,7 @@ - SELECT csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code, + SELECT bosr.id,csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code, bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong, bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime",csi.measure_type AS "measureType" FROM @@ -68,13 +68,19 @@ AND (bosr.sample_status = 2 OR bosr.sample_status = 3) - + AND bosr.sample_status = #{request.sampleStatus} + + and id in + + #{id} + + ) bosr ON bo.id = bosr.order_id JOIN ( SELECT * - FROM customer_sample_info + FROM customer_sample_info csi WHERE is_del=0 AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') 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 7632b98..3cc3f82 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 @@ -1,5 +1,6 @@ package com.casic.missiles.dto.business.dispatch; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.NonNull; @@ -7,6 +8,7 @@ import java.util.List; @Data +@ApiModel("设备接收列表") public class DeviceDispatchDTO { @ApiModelProperty(value = "样品编号", dataType = "String") @@ -28,7 +30,6 @@ private String sampleBelong; @ApiModelProperty(value = "样品状态", dataType = "String") - @NonNull private String sampleStatus; @ApiModelProperty(value = "开始时间", dataType = "String") diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java deleted file mode 100644 index 7f16692..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java +++ /dev/null @@ -1,10 +0,0 @@ - - -package com.casic.missiles.mapper.business; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.business.interchange.InterchangeListResponse; - -public interface BusinessInterchangeListResponseMapper extends BaseMapper { -} - diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java index 5ab214c..d00db2e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -24,5 +24,4 @@ Long selectMaxExchangeNo(); - } 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 1086ec8..94760a8 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -35,7 +35,7 @@ - SELECT csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code, + SELECT bosr.id,csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code, bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong, bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime",csi.measure_type AS "measureType" FROM @@ -68,13 +68,19 @@ AND (bosr.sample_status = 2 OR bosr.sample_status = 3) - + AND bosr.sample_status = #{request.sampleStatus} + + and id in + + #{id} + + ) bosr ON bo.id = bosr.order_id JOIN ( SELECT * - FROM customer_sample_info + FROM customer_sample_info csi WHERE is_del=0 AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') 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 7632b98..3cc3f82 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 @@ -1,5 +1,6 @@ package com.casic.missiles.dto.business.dispatch; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.NonNull; @@ -7,6 +8,7 @@ import java.util.List; @Data +@ApiModel("设备接收列表") public class DeviceDispatchDTO { @ApiModelProperty(value = "样品编号", dataType = "String") @@ -28,7 +30,6 @@ private String sampleBelong; @ApiModelProperty(value = "样品状态", dataType = "String") - @NonNull private String sampleStatus; @ApiModelProperty(value = "开始时间", dataType = "String") 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 01901d5..9178cf2 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 @@ -3,6 +3,7 @@ import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Builder; import lombok.Data; import java.util.List; diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java deleted file mode 100644 index 7f16692..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java +++ /dev/null @@ -1,10 +0,0 @@ - - -package com.casic.missiles.mapper.business; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.business.interchange.InterchangeListResponse; - -public interface BusinessInterchangeListResponseMapper extends BaseMapper { -} - diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java index 5ab214c..d00db2e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -24,5 +24,4 @@ Long selectMaxExchangeNo(); - } 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 1086ec8..94760a8 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -35,7 +35,7 @@ - SELECT csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code, + SELECT bosr.id,csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code, bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong, bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime",csi.measure_type AS "measureType" FROM @@ -68,13 +68,19 @@ AND (bosr.sample_status = 2 OR bosr.sample_status = 3) - + AND bosr.sample_status = #{request.sampleStatus} + + and id in + + #{id} + + ) bosr ON bo.id = bosr.order_id JOIN ( SELECT * - FROM customer_sample_info + FROM customer_sample_info csi WHERE is_del=0 AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') 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 7632b98..3cc3f82 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 @@ -1,5 +1,6 @@ package com.casic.missiles.dto.business.dispatch; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.NonNull; @@ -7,6 +8,7 @@ import java.util.List; @Data +@ApiModel("设备接收列表") public class DeviceDispatchDTO { @ApiModelProperty(value = "样品编号", dataType = "String") @@ -28,7 +30,6 @@ private String sampleBelong; @ApiModelProperty(value = "样品状态", dataType = "String") - @NonNull private String sampleStatus; @ApiModelProperty(value = "开始时间", dataType = "String") 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 01901d5..9178cf2 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 @@ -3,6 +3,7 @@ import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Builder; import lombok.Data; import java.util.List; 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 8c16d66..37ea25c 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 @@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -30,10 +31,12 @@ @ApiModelProperty(value = "委托方代码", dataType = "String") @ExcelProperty(value = "委托方代码",order = 1) + @TableField(exist = false) private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") @ExcelProperty(value = "委托方名称",order = 2) + @TableField(exist = false) private String customerName; @ApiModelProperty(value = "接收人", dataType = "String") @@ -49,6 +52,7 @@ private String deliverTime; @ApiModelProperty(value = "委托书编号", dataType = "String") + @TableField(exist = false) private String orderNo; @ApiModelProperty(value = "要求捡完时间", dataType = "String") diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java deleted file mode 100644 index 7f16692..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java +++ /dev/null @@ -1,10 +0,0 @@ - - -package com.casic.missiles.mapper.business; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.business.interchange.InterchangeListResponse; - -public interface BusinessInterchangeListResponseMapper extends BaseMapper { -} - diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java index 5ab214c..d00db2e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -24,5 +24,4 @@ Long selectMaxExchangeNo(); - } 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 1086ec8..94760a8 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -35,7 +35,7 @@ - SELECT csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code, + SELECT bosr.id,csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code, bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong, bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime",csi.measure_type AS "measureType" FROM @@ -68,13 +68,19 @@ AND (bosr.sample_status = 2 OR bosr.sample_status = 3) - + AND bosr.sample_status = #{request.sampleStatus} + + and id in + + #{id} + + ) bosr ON bo.id = bosr.order_id JOIN ( SELECT * - FROM customer_sample_info + FROM customer_sample_info csi WHERE is_del=0 AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') 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 7632b98..3cc3f82 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 @@ -1,5 +1,6 @@ package com.casic.missiles.dto.business.dispatch; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.NonNull; @@ -7,6 +8,7 @@ import java.util.List; @Data +@ApiModel("设备接收列表") public class DeviceDispatchDTO { @ApiModelProperty(value = "样品编号", dataType = "String") @@ -28,7 +30,6 @@ private String sampleBelong; @ApiModelProperty(value = "样品状态", dataType = "String") - @NonNull private String sampleStatus; @ApiModelProperty(value = "开始时间", dataType = "String") 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 01901d5..9178cf2 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 @@ -3,6 +3,7 @@ import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Builder; import lombok.Data; import java.util.List; 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 8c16d66..37ea25c 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 @@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -30,10 +31,12 @@ @ApiModelProperty(value = "委托方代码", dataType = "String") @ExcelProperty(value = "委托方代码",order = 1) + @TableField(exist = false) private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") @ExcelProperty(value = "委托方名称",order = 2) + @TableField(exist = false) private String customerName; @ApiModelProperty(value = "接收人", dataType = "String") @@ -49,6 +52,7 @@ private String deliverTime; @ApiModelProperty(value = "委托书编号", dataType = "String") + @TableField(exist = false) private String orderNo; @ApiModelProperty(value = "要求捡完时间", dataType = "String") 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 49370a8..71a8a19 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 @@ -16,17 +16,14 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.mapper.business.BusinessInterchangeListResponseMapper; import com.casic.missiles.mapper.business.BusinessInterchangeMapper; import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; import com.casic.missiles.model.business.BusinessInterchange; import com.casic.missiles.model.business.BusinessOrderSampleRelation; -import com.casic.missiles.model.customer.CustomerSampleInfo; import com.casic.missiles.service.business.IBusinessInterchangeService; 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; @@ -47,9 +44,7 @@ public class BusinessInterchangeServiceImpl extends ServiceImpl implements IBusinessInterchangeService { private final IBaseExportService iBaseExportService; - private final CustomerSampleService customerSampleService; private final BusinessOrderSampleRelationMapper sampleRelationMapper; - private final BusinessInterchangeListResponseMapper businessInterchangeListResponseMapper; //** 送检人查询条件不在设备交接单中，需要联查才可以实现 @Override @@ -66,8 +61,8 @@ queryWrapper.eq("order_id", businessExchange.getOrderId()); List orderSampleList = sampleRelationMapper.selectList(queryWrapper); List customerSampleList = new ArrayList<>(); - for(BusinessOrderSampleRelation businessOrderSampleRelation:orderSampleList ){ - CustomerSampleListVO customerSampleListVO=sampleRelationMapper.getInterChangeSampleList(businessOrderSampleRelation.getOrderId(),businessOrderSampleRelation.getSampleId()); + for (BusinessOrderSampleRelation businessOrderSampleRelation : orderSampleList) { + CustomerSampleListVO customerSampleListVO = sampleRelationMapper.getInterChangeSampleList(businessOrderSampleRelation.getOrderId(), businessOrderSampleRelation.getSampleId()); customerSampleList.add(customerSampleListVO); } businessExchange.setCustomerSampleList(customerSampleList); @@ -77,7 +72,7 @@ @Override public ReturnDTO deleteExchange(Long id) { Integer deleteFlag = this.baseMapper.deleteById(id); - if (deleteFlag > 0 ) { + if (deleteFlag > 0) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -117,22 +112,31 @@ @Override public void exportExchange(InterchangeListRequest request, HttpServletResponse response) { try { - List resultPage; + List resultList; if (!CollectionUtils.isEmpty(request.getIds())) { - resultPage = businessInterchangeListResponseMapper.selectBatchIds(request.getIds()); - } else { - Page page = PageFactory.defaultPage(); - page.setCurrent(1); - page.setSearchCount(false); - page.setSize(Integer.MAX_VALUE); - resultPage = this.baseMapper.selectInterchangeListPage(page, request); + initFlushEmpty(request); } - iBaseExportService.exportExcel(response, InterchangeListResponse.class, resultPage, ExportEnum.EXCHANGE_DATA.getSheetName()); + Page page = PageFactory.defaultPage(); + page.setCurrent(1); + page.setSearchCount(false); + page.setSize(Integer.MAX_VALUE); + resultList = this.baseMapper.selectInterchangeListPage(page, request); + iBaseExportService.exportExcel(response, InterchangeListResponse.class, resultList, ExportEnum.EXCHANGE_DATA.getSheetName()); } catch (Exception e) { log.error("样品导出出现异常，异常信息为{}", e); } } + private void initFlushEmpty(InterchangeListRequest request) { + request.setEndTime(null); + request.setInterchangeCode(null); + request.setCustomerNo(null); + request.setCustomerName(null); + request.setDeliverer(null); + request.setReciever(null); + request.setStartTime(null); + } + private void populationExchange(BusinessInterchange businessInterchange) { Long maxNo = this.baseMapper.selectMaxExchangeNo(); String orderNo = NumberGeneratorUtil.getContactNo("jjdh", maxNo); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java deleted file mode 100644 index 7f16692..0000000 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeListResponseMapper.java +++ /dev/null @@ -1,10 +0,0 @@ - - -package com.casic.missiles.mapper.business; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.casic.missiles.dto.business.interchange.InterchangeListResponse; - -public interface BusinessInterchangeListResponseMapper extends BaseMapper { -} - diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java index 5ab214c..d00db2e 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessInterchangeMapper.java @@ -24,5 +24,4 @@ Long selectMaxExchangeNo(); - } 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 1086ec8..94760a8 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessCertificateReportMapper.xml @@ -35,7 +35,7 @@ - SELECT csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code, + SELECT bosr.id,csi.id AS "sampleId", csi.sample_no, csi.sample_name, csi.sample_model, csi.manufacturing_no,bo.order_code, bo.id AS orderId,bo.customer_id,bo.customer_name,bo.customer_no,bo.deliverer,bo.is_urgent,csi.sample_belong, bo.require_over_time,bosr.sample_status,bosr.real_deliver_time AS "realDeliverTime",csi.measure_type AS "measureType" FROM @@ -68,13 +68,19 @@ AND (bosr.sample_status = 2 OR bosr.sample_status = 3) - + AND bosr.sample_status = #{request.sampleStatus} + + and id in + + #{id} + + ) bosr ON bo.id = bosr.order_id JOIN ( SELECT * - FROM customer_sample_info + FROM customer_sample_info csi WHERE is_del=0 AND csi.sample_no LIKE concat('%',#{request.sampleNo},'%') 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 7632b98..3cc3f82 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 @@ -1,5 +1,6 @@ package com.casic.missiles.dto.business.dispatch; +import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.NonNull; @@ -7,6 +8,7 @@ import java.util.List; @Data +@ApiModel("设备接收列表") public class DeviceDispatchDTO { @ApiModelProperty(value = "样品编号", dataType = "String") @@ -28,7 +30,6 @@ private String sampleBelong; @ApiModelProperty(value = "样品状态", dataType = "String") - @NonNull private String sampleStatus; @ApiModelProperty(value = "开始时间", dataType = "String") 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 01901d5..9178cf2 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 @@ -3,6 +3,7 @@ import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Builder; import lombok.Data; import java.util.List; 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 8c16d66..37ea25c 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 @@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.annotation.write.style.HeadRowHeight; import com.alibaba.excel.enums.poi.BorderStyleEnum; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -30,10 +31,12 @@ @ApiModelProperty(value = "委托方代码", dataType = "String") @ExcelProperty(value = "委托方代码",order = 1) + @TableField(exist = false) private String customerNo; @ApiModelProperty(value = "委托方名称", dataType = "String") @ExcelProperty(value = "委托方名称",order = 2) + @TableField(exist = false) private String customerName; @ApiModelProperty(value = "接收人", dataType = "String") @@ -49,6 +52,7 @@ private String deliverTime; @ApiModelProperty(value = "委托书编号", dataType = "String") + @TableField(exist = false) private String orderNo; @ApiModelProperty(value = "要求捡完时间", dataType = "String") 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 49370a8..71a8a19 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 @@ -16,17 +16,14 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.mapper.business.BusinessInterchangeListResponseMapper; import com.casic.missiles.mapper.business.BusinessInterchangeMapper; import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; import com.casic.missiles.model.business.BusinessInterchange; import com.casic.missiles.model.business.BusinessOrderSampleRelation; -import com.casic.missiles.model.customer.CustomerSampleInfo; import com.casic.missiles.service.business.IBusinessInterchangeService; 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; @@ -47,9 +44,7 @@ public class BusinessInterchangeServiceImpl extends ServiceImpl implements IBusinessInterchangeService { private final IBaseExportService iBaseExportService; - private final CustomerSampleService customerSampleService; private final BusinessOrderSampleRelationMapper sampleRelationMapper; - private final BusinessInterchangeListResponseMapper businessInterchangeListResponseMapper; //** 送检人查询条件不在设备交接单中，需要联查才可以实现 @Override @@ -66,8 +61,8 @@ queryWrapper.eq("order_id", businessExchange.getOrderId()); List orderSampleList = sampleRelationMapper.selectList(queryWrapper); List customerSampleList = new ArrayList<>(); - for(BusinessOrderSampleRelation businessOrderSampleRelation:orderSampleList ){ - CustomerSampleListVO customerSampleListVO=sampleRelationMapper.getInterChangeSampleList(businessOrderSampleRelation.getOrderId(),businessOrderSampleRelation.getSampleId()); + for (BusinessOrderSampleRelation businessOrderSampleRelation : orderSampleList) { + CustomerSampleListVO customerSampleListVO = sampleRelationMapper.getInterChangeSampleList(businessOrderSampleRelation.getOrderId(), businessOrderSampleRelation.getSampleId()); customerSampleList.add(customerSampleListVO); } businessExchange.setCustomerSampleList(customerSampleList); @@ -77,7 +72,7 @@ @Override public ReturnDTO deleteExchange(Long id) { Integer deleteFlag = this.baseMapper.deleteById(id); - if (deleteFlag > 0 ) { + if (deleteFlag > 0) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); @@ -117,22 +112,31 @@ @Override public void exportExchange(InterchangeListRequest request, HttpServletResponse response) { try { - List resultPage; + List resultList; if (!CollectionUtils.isEmpty(request.getIds())) { - resultPage = businessInterchangeListResponseMapper.selectBatchIds(request.getIds()); - } else { - Page page = PageFactory.defaultPage(); - page.setCurrent(1); - page.setSearchCount(false); - page.setSize(Integer.MAX_VALUE); - resultPage = this.baseMapper.selectInterchangeListPage(page, request); + initFlushEmpty(request); } - iBaseExportService.exportExcel(response, InterchangeListResponse.class, resultPage, ExportEnum.EXCHANGE_DATA.getSheetName()); + Page page = PageFactory.defaultPage(); + page.setCurrent(1); + page.setSearchCount(false); + page.setSize(Integer.MAX_VALUE); + resultList = this.baseMapper.selectInterchangeListPage(page, request); + iBaseExportService.exportExcel(response, InterchangeListResponse.class, resultList, ExportEnum.EXCHANGE_DATA.getSheetName()); } catch (Exception e) { log.error("样品导出出现异常，异常信息为{}", e); } } + private void initFlushEmpty(InterchangeListRequest request) { + request.setEndTime(null); + request.setInterchangeCode(null); + request.setCustomerNo(null); + request.setCustomerName(null); + request.setDeliverer(null); + request.setReciever(null); + request.setStartTime(null); + } + private void populationExchange(BusinessInterchange businessInterchange) { Long maxNo = this.baseMapper.selectMaxExchangeNo(); String orderNo = NumberGeneratorUtil.getContactNo("jjdh", maxNo); 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 ec04b35..e8ae76b 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 @@ -134,23 +134,21 @@ 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); + initDeviceDispatchDTOEmpty(request); } + 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); } } + + @Override public ReturnDTO statusChange(DeviceStatusChangeDTO deviceStatusChangeDTO) { Integer updateFalg = this.statusChangeUpdator(deviceStatusChangeDTO, false); @@ -166,21 +164,21 @@ public ReturnDTO forcedTerminate(DeviceStatusChangeDTO deviceStatusChangeDTO) { Integer updateFlag = this.statusChangeUpdator(deviceStatusChangeDTO, true); //实验室状态数据的更新 - Integer updateReasonFlag = reasonPopulation(deviceStatusChangeDTO); - if (updateFlag > 0 && updateReasonFlag > 0) { + reasonPopulation(deviceStatusChangeDTO); + if (updateFlag > 0) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } - private Integer reasonPopulation(DeviceStatusChangeDTO deviceStatusChangeDTO) { + private void reasonPopulation(DeviceStatusChangeDTO deviceStatusChangeDTO) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("sample_id", deviceStatusChangeDTO.getSampleId()); queryWrapper.eq("order_id", deviceStatusChangeDTO.getOrderId()); BusinessLabExecutiveInfo businessLabExecutiveInfo = new BusinessLabExecutiveInfo(); businessLabExecutiveInfo.setMeasureStatus(deviceStatusChangeDTO.getStatus()); businessLabExecutiveInfo.setRemark(deviceStatusChangeDTO.getReason()); - return labExecutiveInfoMapper.update(businessLabExecutiveInfo, queryWrapper); + labExecutiveInfoMapper.update(businessLabExecutiveInfo, queryWrapper); } @Override @@ -239,6 +237,18 @@ } } + private void initDeviceDispatchDTOEmpty(DeviceDispatchDTO request){ + request.setSampleName(null); + request.setSampleNo(null); + request.setOrderNo(null); + request.setCustomerNo(null); + request.setIsUrgent(null); + request.setSampleBelong(null); + request.setSampleStatus(null); + request.setStartTime(null); + request.setEndTime(null); + } + // 判断样品是完成或接收状态，直接显示即可 private Boolean checkSampleFinshStauts(DeviceDispatchVO dispatchVO) { if (SampleStatusEnum.TO_RECEIVE.equals(dispatchVO.getSampleStatus())) {