diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index a31f9c1..470135e 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.github.oshi diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index a31f9c1..470135e 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java new file mode 100644 index 0000000..fda9f0d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java @@ -0,0 +1,13 @@ +package com.casic.missiles.enums.plan; + +import liquibase.pro.packaged.S; + +public interface OrderStatusEnum { + + String RECEIVE_STATUS_COMPLETE = "4"; // 接收状态-检测完成 + + + String ORDER_STATUS_TO_BACK = "6"; // 任务单状态 - 待取回 + + String ORDER_STATUS_BACKED = "7"; // 任务单状态 - 已取回 +} diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index a31f9c1..470135e 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java new file mode 100644 index 0000000..fda9f0d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java @@ -0,0 +1,13 @@ +package com.casic.missiles.enums.plan; + +import liquibase.pro.packaged.S; + +public interface OrderStatusEnum { + + String RECEIVE_STATUS_COMPLETE = "4"; // 接收状态-检测完成 + + + String ORDER_STATUS_TO_BACK = "6"; // 任务单状态 - 待取回 + + String ORDER_STATUS_BACKED = "7"; // 任务单状态 - 已取回 +} diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index d52996f..993d279 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index a31f9c1..470135e 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java new file mode 100644 index 0000000..fda9f0d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java @@ -0,0 +1,13 @@ +package com.casic.missiles.enums.plan; + +import liquibase.pro.packaged.S; + +public interface OrderStatusEnum { + + String RECEIVE_STATUS_COMPLETE = "4"; // 接收状态-检测完成 + + + String ORDER_STATUS_TO_BACK = "6"; // 任务单状态 - 待取回 + + String ORDER_STATUS_BACKED = "7"; // 任务单状态 - 已取回 +} diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index d52996f..993d279 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 359c1f2..36aa2ed 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; import com.casic.missiles.model.business.BizBusinessOrderSampleRelation; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -36,4 +37,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + @Select("select conclusion from biz_business_device_measure_info where order_id = #{orderId} and sample_id = #{sampleId} order by id desc limit 1") + String getConclusion(@Param("orderId")Long orderId,@Param("sampleId")Long sampleId); + + @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") + Integer getUnBackCount(@Param("orderId")Long orderId); } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index a31f9c1..470135e 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java new file mode 100644 index 0000000..fda9f0d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java @@ -0,0 +1,13 @@ +package com.casic.missiles.enums.plan; + +import liquibase.pro.packaged.S; + +public interface OrderStatusEnum { + + String RECEIVE_STATUS_COMPLETE = "4"; // 接收状态-检测完成 + + + String ORDER_STATUS_TO_BACK = "6"; // 任务单状态 - 待取回 + + String ORDER_STATUS_BACKED = "7"; // 任务单状态 - 已取回 +} diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index d52996f..993d279 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 359c1f2..36aa2ed 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; import com.casic.missiles.model.business.BizBusinessOrderSampleRelation; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -36,4 +37,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + @Select("select conclusion from biz_business_device_measure_info where order_id = #{orderId} and sample_id = #{sampleId} order by id desc limit 1") + String getConclusion(@Param("orderId")Long orderId,@Param("sampleId")Long sampleId); + + @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") + Integer getUnBackCount(@Param("orderId")Long orderId); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml index e4a103f..5f5886b 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml @@ -42,7 +42,7 @@ select * from ( SELECT * --- ,(select dept_id from sys_user where id = create_user_id) as dept_id + ,(select count(*) from biz_business_order_sample_relation relation where relation.order_id = biz_business_order_info.id and sample_status='5') as unBackCount FROM biz_business_order_info ) t diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index a31f9c1..470135e 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java new file mode 100644 index 0000000..fda9f0d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java @@ -0,0 +1,13 @@ +package com.casic.missiles.enums.plan; + +import liquibase.pro.packaged.S; + +public interface OrderStatusEnum { + + String RECEIVE_STATUS_COMPLETE = "4"; // 接收状态-检测完成 + + + String ORDER_STATUS_TO_BACK = "6"; // 任务单状态 - 待取回 + + String ORDER_STATUS_BACKED = "7"; // 任务单状态 - 已取回 +} diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index d52996f..993d279 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 359c1f2..36aa2ed 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; import com.casic.missiles.model.business.BizBusinessOrderSampleRelation; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -36,4 +37,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + @Select("select conclusion from biz_business_device_measure_info where order_id = #{orderId} and sample_id = #{sampleId} order by id desc limit 1") + String getConclusion(@Param("orderId")Long orderId,@Param("sampleId")Long sampleId); + + @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") + Integer getUnBackCount(@Param("orderId")Long orderId); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml index e4a103f..5f5886b 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml @@ -42,7 +42,7 @@ select * from ( SELECT * --- ,(select dept_id from sys_user where id = create_user_id) as dept_id + ,(select count(*) from biz_business_order_sample_relation relation where relation.order_id = biz_business_order_info.id and sample_status='5') as unBackCount FROM biz_business_order_info ) t diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 3335fec..1bb8180 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-job - 1.3.2.0 + 1.3.3.0 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index a31f9c1..470135e 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java new file mode 100644 index 0000000..fda9f0d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java @@ -0,0 +1,13 @@ +package com.casic.missiles.enums.plan; + +import liquibase.pro.packaged.S; + +public interface OrderStatusEnum { + + String RECEIVE_STATUS_COMPLETE = "4"; // 接收状态-检测完成 + + + String ORDER_STATUS_TO_BACK = "6"; // 任务单状态 - 待取回 + + String ORDER_STATUS_BACKED = "7"; // 任务单状态 - 已取回 +} diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index d52996f..993d279 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 359c1f2..36aa2ed 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; import com.casic.missiles.model.business.BizBusinessOrderSampleRelation; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -36,4 +37,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + @Select("select conclusion from biz_business_device_measure_info where order_id = #{orderId} and sample_id = #{sampleId} order by id desc limit 1") + String getConclusion(@Param("orderId")Long orderId,@Param("sampleId")Long sampleId); + + @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") + Integer getUnBackCount(@Param("orderId")Long orderId); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml index e4a103f..5f5886b 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml @@ -42,7 +42,7 @@ select * from ( SELECT * --- ,(select dept_id from sys_user where id = create_user_id) as dept_id + ,(select count(*) from biz_business_order_sample_relation relation where relation.order_id = biz_business_order_info.id and sample_status='5') as unBackCount FROM biz_business_order_info ) t diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 3335fec..1bb8180 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-job - 1.3.2.0 + 1.3.3.0 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 3dcc2aa..4e4fd24 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -52,13 +52,13 @@ @GetMapping("/listPage") @ResponseBody public ReturnDTO> listPage(String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo, String equipmentManufacturer, String certificateValidStart,String certificateValidEnd, String checkDateStart, String checkDateEnd) { Page page = PageFactory.defaultPage(); - page = certificateService.listScopePage(page, certificateNo, certificateName, equipmentNo, equipmentName, + page = certificateService.listScopePage(page, certificateNo, certificateName, equipmentNo, equipmentName,equipmentModel, subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo,equipmentManufacturer, certificateValidStart,certificateValidEnd,checkDateStart,checkDateEnd); @@ -69,14 +69,14 @@ @PostMapping("/export") @ResponseBody public void export(String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo,String equipmentManufacturer, String certificateValidStart,String certificateValidEnd, String checkDateStart, String checkDateEnd, @RequestParam("ids") List ids) throws IOException { List list = certificateService.listScope(certificateNo, certificateName, equipmentNo, - equipmentName, subcontractorName, createTimeStart, createTimeEnd, + equipmentName, equipmentModel,subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo,equipmentManufacturer, certificateValidStart,certificateValidEnd,checkDateStart,checkDateEnd, ids); diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index a31f9c1..470135e 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java new file mode 100644 index 0000000..fda9f0d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java @@ -0,0 +1,13 @@ +package com.casic.missiles.enums.plan; + +import liquibase.pro.packaged.S; + +public interface OrderStatusEnum { + + String RECEIVE_STATUS_COMPLETE = "4"; // 接收状态-检测完成 + + + String ORDER_STATUS_TO_BACK = "6"; // 任务单状态 - 待取回 + + String ORDER_STATUS_BACKED = "7"; // 任务单状态 - 已取回 +} diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index d52996f..993d279 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 359c1f2..36aa2ed 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; import com.casic.missiles.model.business.BizBusinessOrderSampleRelation; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -36,4 +37,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + @Select("select conclusion from biz_business_device_measure_info where order_id = #{orderId} and sample_id = #{sampleId} order by id desc limit 1") + String getConclusion(@Param("orderId")Long orderId,@Param("sampleId")Long sampleId); + + @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") + Integer getUnBackCount(@Param("orderId")Long orderId); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml index e4a103f..5f5886b 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml @@ -42,7 +42,7 @@ select * from ( SELECT * --- ,(select dept_id from sys_user where id = create_user_id) as dept_id + ,(select count(*) from biz_business_order_sample_relation relation where relation.order_id = biz_business_order_info.id and sample_status='5') as unBackCount FROM biz_business_order_info ) t diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 3335fec..1bb8180 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-job - 1.3.2.0 + 1.3.3.0 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 3dcc2aa..4e4fd24 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -52,13 +52,13 @@ @GetMapping("/listPage") @ResponseBody public ReturnDTO> listPage(String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo, String equipmentManufacturer, String certificateValidStart,String certificateValidEnd, String checkDateStart, String checkDateEnd) { Page page = PageFactory.defaultPage(); - page = certificateService.listScopePage(page, certificateNo, certificateName, equipmentNo, equipmentName, + page = certificateService.listScopePage(page, certificateNo, certificateName, equipmentNo, equipmentName,equipmentModel, subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo,equipmentManufacturer, certificateValidStart,certificateValidEnd,checkDateStart,checkDateEnd); @@ -69,14 +69,14 @@ @PostMapping("/export") @ResponseBody public void export(String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo,String equipmentManufacturer, String certificateValidStart,String certificateValidEnd, String checkDateStart, String checkDateEnd, @RequestParam("ids") List ids) throws IOException { List list = certificateService.listScope(certificateNo, certificateName, equipmentNo, - equipmentName, subcontractorName, createTimeStart, createTimeEnd, + equipmentName, equipmentModel,subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo,equipmentManufacturer, certificateValidStart,certificateValidEnd,checkDateStart,checkDateEnd, ids); diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 0411c27..bae3416 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.2.0 + 1.3.3.0 compile diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index a31f9c1..470135e 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java new file mode 100644 index 0000000..fda9f0d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java @@ -0,0 +1,13 @@ +package com.casic.missiles.enums.plan; + +import liquibase.pro.packaged.S; + +public interface OrderStatusEnum { + + String RECEIVE_STATUS_COMPLETE = "4"; // 接收状态-检测完成 + + + String ORDER_STATUS_TO_BACK = "6"; // 任务单状态 - 待取回 + + String ORDER_STATUS_BACKED = "7"; // 任务单状态 - 已取回 +} diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index d52996f..993d279 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 359c1f2..36aa2ed 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; import com.casic.missiles.model.business.BizBusinessOrderSampleRelation; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -36,4 +37,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + @Select("select conclusion from biz_business_device_measure_info where order_id = #{orderId} and sample_id = #{sampleId} order by id desc limit 1") + String getConclusion(@Param("orderId")Long orderId,@Param("sampleId")Long sampleId); + + @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") + Integer getUnBackCount(@Param("orderId")Long orderId); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml index e4a103f..5f5886b 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml @@ -42,7 +42,7 @@ select * from ( SELECT * --- ,(select dept_id from sys_user where id = create_user_id) as dept_id + ,(select count(*) from biz_business_order_sample_relation relation where relation.order_id = biz_business_order_info.id and sample_status='5') as unBackCount FROM biz_business_order_info ) t diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 3335fec..1bb8180 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-job - 1.3.2.0 + 1.3.3.0 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 3dcc2aa..4e4fd24 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -52,13 +52,13 @@ @GetMapping("/listPage") @ResponseBody public ReturnDTO> listPage(String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo, String equipmentManufacturer, String certificateValidStart,String certificateValidEnd, String checkDateStart, String checkDateEnd) { Page page = PageFactory.defaultPage(); - page = certificateService.listScopePage(page, certificateNo, certificateName, equipmentNo, equipmentName, + page = certificateService.listScopePage(page, certificateNo, certificateName, equipmentNo, equipmentName,equipmentModel, subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo,equipmentManufacturer, certificateValidStart,certificateValidEnd,checkDateStart,checkDateEnd); @@ -69,14 +69,14 @@ @PostMapping("/export") @ResponseBody public void export(String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo,String equipmentManufacturer, String certificateValidStart,String certificateValidEnd, String checkDateStart, String checkDateEnd, @RequestParam("ids") List ids) throws IOException { List list = certificateService.listScope(certificateNo, certificateName, equipmentNo, - equipmentName, subcontractorName, createTimeStart, createTimeEnd, + equipmentName, equipmentModel,subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo,equipmentManufacturer, certificateValidStart,certificateValidEnd,checkDateStart,checkDateEnd, ids); diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 0411c27..bae3416 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.2.0 + 1.3.3.0 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index a18b82c..731b0bc 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index a31f9c1..470135e 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java new file mode 100644 index 0000000..fda9f0d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java @@ -0,0 +1,13 @@ +package com.casic.missiles.enums.plan; + +import liquibase.pro.packaged.S; + +public interface OrderStatusEnum { + + String RECEIVE_STATUS_COMPLETE = "4"; // 接收状态-检测完成 + + + String ORDER_STATUS_TO_BACK = "6"; // 任务单状态 - 待取回 + + String ORDER_STATUS_BACKED = "7"; // 任务单状态 - 已取回 +} diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index d52996f..993d279 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 359c1f2..36aa2ed 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; import com.casic.missiles.model.business.BizBusinessOrderSampleRelation; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -36,4 +37,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + @Select("select conclusion from biz_business_device_measure_info where order_id = #{orderId} and sample_id = #{sampleId} order by id desc limit 1") + String getConclusion(@Param("orderId")Long orderId,@Param("sampleId")Long sampleId); + + @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") + Integer getUnBackCount(@Param("orderId")Long orderId); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml index e4a103f..5f5886b 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml @@ -42,7 +42,7 @@ select * from ( SELECT * --- ,(select dept_id from sys_user where id = create_user_id) as dept_id + ,(select count(*) from biz_business_order_sample_relation relation where relation.order_id = biz_business_order_info.id and sample_status='5') as unBackCount FROM biz_business_order_info ) t diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 3335fec..1bb8180 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-job - 1.3.2.0 + 1.3.3.0 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 3dcc2aa..4e4fd24 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -52,13 +52,13 @@ @GetMapping("/listPage") @ResponseBody public ReturnDTO> listPage(String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo, String equipmentManufacturer, String certificateValidStart,String certificateValidEnd, String checkDateStart, String checkDateEnd) { Page page = PageFactory.defaultPage(); - page = certificateService.listScopePage(page, certificateNo, certificateName, equipmentNo, equipmentName, + page = certificateService.listScopePage(page, certificateNo, certificateName, equipmentNo, equipmentName,equipmentModel, subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo,equipmentManufacturer, certificateValidStart,certificateValidEnd,checkDateStart,checkDateEnd); @@ -69,14 +69,14 @@ @PostMapping("/export") @ResponseBody public void export(String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo,String equipmentManufacturer, String certificateValidStart,String certificateValidEnd, String checkDateStart, String checkDateEnd, @RequestParam("ids") List ids) throws IOException { List list = certificateService.listScope(certificateNo, certificateName, equipmentNo, - equipmentName, subcontractorName, createTimeStart, createTimeEnd, + equipmentName, equipmentModel,subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo,equipmentManufacturer, certificateValidStart,certificateValidEnd,checkDateStart,checkDateEnd, ids); diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 0411c27..bae3416 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.2.0 + 1.3.3.0 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index a18b82c..731b0bc 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 8296d60..64b9c20 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -46,6 +46,8 @@ String PLAN_EXECUTE_STATUS = DICT_PREFIX + "PlanExecuteStatus"; // 计量计划检定完成度 String PLAN_CHECK_COMPLETION = DICT_PREFIX + "PlanCheckCompletion"; + + String EQPT_ORDER_STATUS = DICT_PREFIX + "TaskStatus"; // 文档变更类型 String FILE_LOG_TYPE = DICT_PREFIX + "FileLogType"; diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index a31f9c1..470135e 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java new file mode 100644 index 0000000..fda9f0d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java @@ -0,0 +1,13 @@ +package com.casic.missiles.enums.plan; + +import liquibase.pro.packaged.S; + +public interface OrderStatusEnum { + + String RECEIVE_STATUS_COMPLETE = "4"; // 接收状态-检测完成 + + + String ORDER_STATUS_TO_BACK = "6"; // 任务单状态 - 待取回 + + String ORDER_STATUS_BACKED = "7"; // 任务单状态 - 已取回 +} diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index d52996f..993d279 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 359c1f2..36aa2ed 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; import com.casic.missiles.model.business.BizBusinessOrderSampleRelation; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -36,4 +37,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + @Select("select conclusion from biz_business_device_measure_info where order_id = #{orderId} and sample_id = #{sampleId} order by id desc limit 1") + String getConclusion(@Param("orderId")Long orderId,@Param("sampleId")Long sampleId); + + @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") + Integer getUnBackCount(@Param("orderId")Long orderId); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml index e4a103f..5f5886b 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml @@ -42,7 +42,7 @@ select * from ( SELECT * --- ,(select dept_id from sys_user where id = create_user_id) as dept_id + ,(select count(*) from biz_business_order_sample_relation relation where relation.order_id = biz_business_order_info.id and sample_status='5') as unBackCount FROM biz_business_order_info ) t diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 3335fec..1bb8180 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-job - 1.3.2.0 + 1.3.3.0 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 3dcc2aa..4e4fd24 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -52,13 +52,13 @@ @GetMapping("/listPage") @ResponseBody public ReturnDTO> listPage(String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo, String equipmentManufacturer, String certificateValidStart,String certificateValidEnd, String checkDateStart, String checkDateEnd) { Page page = PageFactory.defaultPage(); - page = certificateService.listScopePage(page, certificateNo, certificateName, equipmentNo, equipmentName, + page = certificateService.listScopePage(page, certificateNo, certificateName, equipmentNo, equipmentName,equipmentModel, subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo,equipmentManufacturer, certificateValidStart,certificateValidEnd,checkDateStart,checkDateEnd); @@ -69,14 +69,14 @@ @PostMapping("/export") @ResponseBody public void export(String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo,String equipmentManufacturer, String certificateValidStart,String certificateValidEnd, String checkDateStart, String checkDateEnd, @RequestParam("ids") List ids) throws IOException { List list = certificateService.listScope(certificateNo, certificateName, equipmentNo, - equipmentName, subcontractorName, createTimeStart, createTimeEnd, + equipmentName, equipmentModel,subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo,equipmentManufacturer, certificateValidStart,certificateValidEnd,checkDateStart,checkDateEnd, ids); diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 0411c27..bae3416 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.2.0 + 1.3.3.0 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index a18b82c..731b0bc 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 8296d60..64b9c20 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -46,6 +46,8 @@ String PLAN_EXECUTE_STATUS = DICT_PREFIX + "PlanExecuteStatus"; // 计量计划检定完成度 String PLAN_CHECK_COMPLETION = DICT_PREFIX + "PlanCheckCompletion"; + + String EQPT_ORDER_STATUS = DICT_PREFIX + "TaskStatus"; // 文档变更类型 String FILE_LOG_TYPE = DICT_PREFIX + "FileLogType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java index 7de9c2d..c300fc1 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java @@ -39,8 +39,11 @@ @ApiModelProperty(value = "出厂编号") private String manufactureNo; - @ApiModelProperty(value = "接收状态（包括接收相关状态和检测完成状态）", dataType = "String") - private String receiveStatus; +// @ApiModelProperty(value = "接收状态（包括接收相关状态和检测完成状态）", dataType = "String") +// private String receiveStatus; + + @ApiModelProperty(value = "任务单状态", dataType = "String") + private String orderStatus; @ApiModelProperty(value = "是否现场检定") private Integer isOnSiteCheck; diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index a31f9c1..470135e 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java new file mode 100644 index 0000000..fda9f0d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java @@ -0,0 +1,13 @@ +package com.casic.missiles.enums.plan; + +import liquibase.pro.packaged.S; + +public interface OrderStatusEnum { + + String RECEIVE_STATUS_COMPLETE = "4"; // 接收状态-检测完成 + + + String ORDER_STATUS_TO_BACK = "6"; // 任务单状态 - 待取回 + + String ORDER_STATUS_BACKED = "7"; // 任务单状态 - 已取回 +} diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index d52996f..993d279 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 359c1f2..36aa2ed 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; import com.casic.missiles.model.business.BizBusinessOrderSampleRelation; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -36,4 +37,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + @Select("select conclusion from biz_business_device_measure_info where order_id = #{orderId} and sample_id = #{sampleId} order by id desc limit 1") + String getConclusion(@Param("orderId")Long orderId,@Param("sampleId")Long sampleId); + + @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") + Integer getUnBackCount(@Param("orderId")Long orderId); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml index e4a103f..5f5886b 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml @@ -42,7 +42,7 @@ select * from ( SELECT * --- ,(select dept_id from sys_user where id = create_user_id) as dept_id + ,(select count(*) from biz_business_order_sample_relation relation where relation.order_id = biz_business_order_info.id and sample_status='5') as unBackCount FROM biz_business_order_info ) t diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 3335fec..1bb8180 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-job - 1.3.2.0 + 1.3.3.0 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 3dcc2aa..4e4fd24 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -52,13 +52,13 @@ @GetMapping("/listPage") @ResponseBody public ReturnDTO> listPage(String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo, String equipmentManufacturer, String certificateValidStart,String certificateValidEnd, String checkDateStart, String checkDateEnd) { Page page = PageFactory.defaultPage(); - page = certificateService.listScopePage(page, certificateNo, certificateName, equipmentNo, equipmentName, + page = certificateService.listScopePage(page, certificateNo, certificateName, equipmentNo, equipmentName,equipmentModel, subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo,equipmentManufacturer, certificateValidStart,certificateValidEnd,checkDateStart,checkDateEnd); @@ -69,14 +69,14 @@ @PostMapping("/export") @ResponseBody public void export(String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo,String equipmentManufacturer, String certificateValidStart,String certificateValidEnd, String checkDateStart, String checkDateEnd, @RequestParam("ids") List ids) throws IOException { List list = certificateService.listScope(certificateNo, certificateName, equipmentNo, - equipmentName, subcontractorName, createTimeStart, createTimeEnd, + equipmentName, equipmentModel,subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo,equipmentManufacturer, certificateValidStart,certificateValidEnd,checkDateStart,checkDateEnd, ids); diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 0411c27..bae3416 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.2.0 + 1.3.3.0 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index a18b82c..731b0bc 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 8296d60..64b9c20 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -46,6 +46,8 @@ String PLAN_EXECUTE_STATUS = DICT_PREFIX + "PlanExecuteStatus"; // 计量计划检定完成度 String PLAN_CHECK_COMPLETION = DICT_PREFIX + "PlanCheckCompletion"; + + String EQPT_ORDER_STATUS = DICT_PREFIX + "TaskStatus"; // 文档变更类型 String FILE_LOG_TYPE = DICT_PREFIX + "FileLogType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java index 7de9c2d..c300fc1 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java @@ -39,8 +39,11 @@ @ApiModelProperty(value = "出厂编号") private String manufactureNo; - @ApiModelProperty(value = "接收状态（包括接收相关状态和检测完成状态）", dataType = "String") - private String receiveStatus; +// @ApiModelProperty(value = "接收状态（包括接收相关状态和检测完成状态）", dataType = "String") +// private String receiveStatus; + + @ApiModelProperty(value = "任务单状态", dataType = "String") + private String orderStatus; @ApiModelProperty(value = "是否现场检定") private Integer isOnSiteCheck; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java index f17b7a7..3e92a46 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java @@ -57,13 +57,30 @@ @ApiModelProperty(value = "接收状态名称", dataType = "String") private String receiveStatusName; + @ApiModelProperty(value = "任务单状态", dataType = "String") + @DictCodeField(message = "任务单状态不合法", cacheName = MeterDictCode.EQPT_ORDER_STATUS) + @TableField(exist = false) + private String orderStatus; + + @TableField(exist = false) + @ApiModelProperty(value = "任务单状态名称", dataType = "String") + private String orderStatusName; + + @TableField(exist = false) + @ApiModelProperty(hidden = true) + private Integer unBackCount; + + @ApiModelProperty(value = "创建人名字", dataType = "String") private String createUserName; @ApiModelProperty(value = "创建时间", dataType = "String") private String createTime; - @ApiModelProperty(value = "计划送检时间", dataType = "String") + @ApiModelProperty(value = "要求检完时间", dataType = "String") private String requireOverTime; + @ApiModelProperty(value = "预计送达时间", dataType = "String") + private String planDeliverTime; + } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index a31f9c1..470135e 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java new file mode 100644 index 0000000..fda9f0d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java @@ -0,0 +1,13 @@ +package com.casic.missiles.enums.plan; + +import liquibase.pro.packaged.S; + +public interface OrderStatusEnum { + + String RECEIVE_STATUS_COMPLETE = "4"; // 接收状态-检测完成 + + + String ORDER_STATUS_TO_BACK = "6"; // 任务单状态 - 待取回 + + String ORDER_STATUS_BACKED = "7"; // 任务单状态 - 已取回 +} diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index d52996f..993d279 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 359c1f2..36aa2ed 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; import com.casic.missiles.model.business.BizBusinessOrderSampleRelation; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -36,4 +37,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + @Select("select conclusion from biz_business_device_measure_info where order_id = #{orderId} and sample_id = #{sampleId} order by id desc limit 1") + String getConclusion(@Param("orderId")Long orderId,@Param("sampleId")Long sampleId); + + @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") + Integer getUnBackCount(@Param("orderId")Long orderId); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml index e4a103f..5f5886b 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml @@ -42,7 +42,7 @@ select * from ( SELECT * --- ,(select dept_id from sys_user where id = create_user_id) as dept_id + ,(select count(*) from biz_business_order_sample_relation relation where relation.order_id = biz_business_order_info.id and sample_status='5') as unBackCount FROM biz_business_order_info ) t diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 3335fec..1bb8180 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-job - 1.3.2.0 + 1.3.3.0 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 3dcc2aa..4e4fd24 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -52,13 +52,13 @@ @GetMapping("/listPage") @ResponseBody public ReturnDTO> listPage(String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo, String equipmentManufacturer, String certificateValidStart,String certificateValidEnd, String checkDateStart, String checkDateEnd) { Page page = PageFactory.defaultPage(); - page = certificateService.listScopePage(page, certificateNo, certificateName, equipmentNo, equipmentName, + page = certificateService.listScopePage(page, certificateNo, certificateName, equipmentNo, equipmentName,equipmentModel, subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo,equipmentManufacturer, certificateValidStart,certificateValidEnd,checkDateStart,checkDateEnd); @@ -69,14 +69,14 @@ @PostMapping("/export") @ResponseBody public void export(String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo,String equipmentManufacturer, String certificateValidStart,String certificateValidEnd, String checkDateStart, String checkDateEnd, @RequestParam("ids") List ids) throws IOException { List list = certificateService.listScope(certificateNo, certificateName, equipmentNo, - equipmentName, subcontractorName, createTimeStart, createTimeEnd, + equipmentName, equipmentModel,subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo,equipmentManufacturer, certificateValidStart,certificateValidEnd,checkDateStart,checkDateEnd, ids); diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 0411c27..bae3416 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.2.0 + 1.3.3.0 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index a18b82c..731b0bc 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 8296d60..64b9c20 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -46,6 +46,8 @@ String PLAN_EXECUTE_STATUS = DICT_PREFIX + "PlanExecuteStatus"; // 计量计划检定完成度 String PLAN_CHECK_COMPLETION = DICT_PREFIX + "PlanCheckCompletion"; + + String EQPT_ORDER_STATUS = DICT_PREFIX + "TaskStatus"; // 文档变更类型 String FILE_LOG_TYPE = DICT_PREFIX + "FileLogType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java index 7de9c2d..c300fc1 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java @@ -39,8 +39,11 @@ @ApiModelProperty(value = "出厂编号") private String manufactureNo; - @ApiModelProperty(value = "接收状态（包括接收相关状态和检测完成状态）", dataType = "String") - private String receiveStatus; +// @ApiModelProperty(value = "接收状态（包括接收相关状态和检测完成状态）", dataType = "String") +// private String receiveStatus; + + @ApiModelProperty(value = "任务单状态", dataType = "String") + private String orderStatus; @ApiModelProperty(value = "是否现场检定") private Integer isOnSiteCheck; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java index f17b7a7..3e92a46 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java @@ -57,13 +57,30 @@ @ApiModelProperty(value = "接收状态名称", dataType = "String") private String receiveStatusName; + @ApiModelProperty(value = "任务单状态", dataType = "String") + @DictCodeField(message = "任务单状态不合法", cacheName = MeterDictCode.EQPT_ORDER_STATUS) + @TableField(exist = false) + private String orderStatus; + + @TableField(exist = false) + @ApiModelProperty(value = "任务单状态名称", dataType = "String") + private String orderStatusName; + + @TableField(exist = false) + @ApiModelProperty(hidden = true) + private Integer unBackCount; + + @ApiModelProperty(value = "创建人名字", dataType = "String") private String createUserName; @ApiModelProperty(value = "创建时间", dataType = "String") private String createTime; - @ApiModelProperty(value = "计划送检时间", dataType = "String") + @ApiModelProperty(value = "要求检完时间", dataType = "String") private String requireOverTime; + @ApiModelProperty(value = "预计送达时间", dataType = "String") + private String planDeliverTime; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java index 5773c4e..be0e35a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java @@ -40,6 +40,14 @@ @ApiModelProperty("使用状态名称") private String usageStatusName; + + @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_CHECK_DESTINATION,needValid = true,message = "检定去向不合法") + @ApiModelProperty(value = "检定去向",notes = "检定去向") + private String checkDestination; + + @ApiModelProperty("检定去向名称") + private String checkDestinationName; + @ApiModelProperty("计量标识") @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_METER_IDENTITY) private String meterIdentify; @@ -57,4 +65,7 @@ @ApiModelProperty("检定状态名称") private String checkStatusName; + + + } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index a31f9c1..470135e 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java new file mode 100644 index 0000000..fda9f0d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java @@ -0,0 +1,13 @@ +package com.casic.missiles.enums.plan; + +import liquibase.pro.packaged.S; + +public interface OrderStatusEnum { + + String RECEIVE_STATUS_COMPLETE = "4"; // 接收状态-检测完成 + + + String ORDER_STATUS_TO_BACK = "6"; // 任务单状态 - 待取回 + + String ORDER_STATUS_BACKED = "7"; // 任务单状态 - 已取回 +} diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index d52996f..993d279 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 359c1f2..36aa2ed 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; import com.casic.missiles.model.business.BizBusinessOrderSampleRelation; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -36,4 +37,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + @Select("select conclusion from biz_business_device_measure_info where order_id = #{orderId} and sample_id = #{sampleId} order by id desc limit 1") + String getConclusion(@Param("orderId")Long orderId,@Param("sampleId")Long sampleId); + + @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") + Integer getUnBackCount(@Param("orderId")Long orderId); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml index e4a103f..5f5886b 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml @@ -42,7 +42,7 @@ select * from ( SELECT * --- ,(select dept_id from sys_user where id = create_user_id) as dept_id + ,(select count(*) from biz_business_order_sample_relation relation where relation.order_id = biz_business_order_info.id and sample_status='5') as unBackCount FROM biz_business_order_info ) t diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 3335fec..1bb8180 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-job - 1.3.2.0 + 1.3.3.0 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 3dcc2aa..4e4fd24 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -52,13 +52,13 @@ @GetMapping("/listPage") @ResponseBody public ReturnDTO> listPage(String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo, String equipmentManufacturer, String certificateValidStart,String certificateValidEnd, String checkDateStart, String checkDateEnd) { Page page = PageFactory.defaultPage(); - page = certificateService.listScopePage(page, certificateNo, certificateName, equipmentNo, equipmentName, + page = certificateService.listScopePage(page, certificateNo, certificateName, equipmentNo, equipmentName,equipmentModel, subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo,equipmentManufacturer, certificateValidStart,certificateValidEnd,checkDateStart,checkDateEnd); @@ -69,14 +69,14 @@ @PostMapping("/export") @ResponseBody public void export(String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo,String equipmentManufacturer, String certificateValidStart,String certificateValidEnd, String checkDateStart, String checkDateEnd, @RequestParam("ids") List ids) throws IOException { List list = certificateService.listScope(certificateNo, certificateName, equipmentNo, - equipmentName, subcontractorName, createTimeStart, createTimeEnd, + equipmentName, equipmentModel,subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo,equipmentManufacturer, certificateValidStart,certificateValidEnd,checkDateStart,checkDateEnd, ids); diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 0411c27..bae3416 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.2.0 + 1.3.3.0 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index a18b82c..731b0bc 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 8296d60..64b9c20 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -46,6 +46,8 @@ String PLAN_EXECUTE_STATUS = DICT_PREFIX + "PlanExecuteStatus"; // 计量计划检定完成度 String PLAN_CHECK_COMPLETION = DICT_PREFIX + "PlanCheckCompletion"; + + String EQPT_ORDER_STATUS = DICT_PREFIX + "TaskStatus"; // 文档变更类型 String FILE_LOG_TYPE = DICT_PREFIX + "FileLogType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java index 7de9c2d..c300fc1 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java @@ -39,8 +39,11 @@ @ApiModelProperty(value = "出厂编号") private String manufactureNo; - @ApiModelProperty(value = "接收状态（包括接收相关状态和检测完成状态）", dataType = "String") - private String receiveStatus; +// @ApiModelProperty(value = "接收状态（包括接收相关状态和检测完成状态）", dataType = "String") +// private String receiveStatus; + + @ApiModelProperty(value = "任务单状态", dataType = "String") + private String orderStatus; @ApiModelProperty(value = "是否现场检定") private Integer isOnSiteCheck; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java index f17b7a7..3e92a46 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java @@ -57,13 +57,30 @@ @ApiModelProperty(value = "接收状态名称", dataType = "String") private String receiveStatusName; + @ApiModelProperty(value = "任务单状态", dataType = "String") + @DictCodeField(message = "任务单状态不合法", cacheName = MeterDictCode.EQPT_ORDER_STATUS) + @TableField(exist = false) + private String orderStatus; + + @TableField(exist = false) + @ApiModelProperty(value = "任务单状态名称", dataType = "String") + private String orderStatusName; + + @TableField(exist = false) + @ApiModelProperty(hidden = true) + private Integer unBackCount; + + @ApiModelProperty(value = "创建人名字", dataType = "String") private String createUserName; @ApiModelProperty(value = "创建时间", dataType = "String") private String createTime; - @ApiModelProperty(value = "计划送检时间", dataType = "String") + @ApiModelProperty(value = "要求检完时间", dataType = "String") private String requireOverTime; + @ApiModelProperty(value = "预计送达时间", dataType = "String") + private String planDeliverTime; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java index 5773c4e..be0e35a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java @@ -40,6 +40,14 @@ @ApiModelProperty("使用状态名称") private String usageStatusName; + + @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_CHECK_DESTINATION,needValid = true,message = "检定去向不合法") + @ApiModelProperty(value = "检定去向",notes = "检定去向") + private String checkDestination; + + @ApiModelProperty("检定去向名称") + private String checkDestinationName; + @ApiModelProperty("计量标识") @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_METER_IDENTITY) private String meterIdentify; @@ -57,4 +65,7 @@ @ApiModelProperty("检定状态名称") private String checkStatusName; + + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java index 74e2d2a..ed74deb 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java @@ -167,6 +167,16 @@ @ApiModelProperty(value = "接收状态名称", dataType = "String") private String receiveStatusName; + + @ApiModelProperty(value = "任务单状态", dataType = "String") + @DictCodeField(message = "任务单状态不合法", cacheName = MeterDictCode.EQPT_ORDER_STATUS) + @TableField(exist = false) + private String orderStatus; + + @TableField(exist = false) + @ApiModelProperty(value = "任务单状态名称", dataType = "String") + private String orderStatusName; + /** * 接收说明 */ diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index a31f9c1..470135e 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java new file mode 100644 index 0000000..fda9f0d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java @@ -0,0 +1,13 @@ +package com.casic.missiles.enums.plan; + +import liquibase.pro.packaged.S; + +public interface OrderStatusEnum { + + String RECEIVE_STATUS_COMPLETE = "4"; // 接收状态-检测完成 + + + String ORDER_STATUS_TO_BACK = "6"; // 任务单状态 - 待取回 + + String ORDER_STATUS_BACKED = "7"; // 任务单状态 - 已取回 +} diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index d52996f..993d279 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 359c1f2..36aa2ed 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; import com.casic.missiles.model.business.BizBusinessOrderSampleRelation; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -36,4 +37,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + @Select("select conclusion from biz_business_device_measure_info where order_id = #{orderId} and sample_id = #{sampleId} order by id desc limit 1") + String getConclusion(@Param("orderId")Long orderId,@Param("sampleId")Long sampleId); + + @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") + Integer getUnBackCount(@Param("orderId")Long orderId); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml index e4a103f..5f5886b 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml @@ -42,7 +42,7 @@ select * from ( SELECT * --- ,(select dept_id from sys_user where id = create_user_id) as dept_id + ,(select count(*) from biz_business_order_sample_relation relation where relation.order_id = biz_business_order_info.id and sample_status='5') as unBackCount FROM biz_business_order_info ) t diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 3335fec..1bb8180 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-job - 1.3.2.0 + 1.3.3.0 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 3dcc2aa..4e4fd24 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -52,13 +52,13 @@ @GetMapping("/listPage") @ResponseBody public ReturnDTO> listPage(String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo, String equipmentManufacturer, String certificateValidStart,String certificateValidEnd, String checkDateStart, String checkDateEnd) { Page page = PageFactory.defaultPage(); - page = certificateService.listScopePage(page, certificateNo, certificateName, equipmentNo, equipmentName, + page = certificateService.listScopePage(page, certificateNo, certificateName, equipmentNo, equipmentName,equipmentModel, subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo,equipmentManufacturer, certificateValidStart,certificateValidEnd,checkDateStart,checkDateEnd); @@ -69,14 +69,14 @@ @PostMapping("/export") @ResponseBody public void export(String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo,String equipmentManufacturer, String certificateValidStart,String certificateValidEnd, String checkDateStart, String checkDateEnd, @RequestParam("ids") List ids) throws IOException { List list = certificateService.listScope(certificateNo, certificateName, equipmentNo, - equipmentName, subcontractorName, createTimeStart, createTimeEnd, + equipmentName, equipmentModel,subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo,equipmentManufacturer, certificateValidStart,certificateValidEnd,checkDateStart,checkDateEnd, ids); diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 0411c27..bae3416 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.2.0 + 1.3.3.0 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index a18b82c..731b0bc 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 8296d60..64b9c20 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -46,6 +46,8 @@ String PLAN_EXECUTE_STATUS = DICT_PREFIX + "PlanExecuteStatus"; // 计量计划检定完成度 String PLAN_CHECK_COMPLETION = DICT_PREFIX + "PlanCheckCompletion"; + + String EQPT_ORDER_STATUS = DICT_PREFIX + "TaskStatus"; // 文档变更类型 String FILE_LOG_TYPE = DICT_PREFIX + "FileLogType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java index 7de9c2d..c300fc1 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java @@ -39,8 +39,11 @@ @ApiModelProperty(value = "出厂编号") private String manufactureNo; - @ApiModelProperty(value = "接收状态（包括接收相关状态和检测完成状态）", dataType = "String") - private String receiveStatus; +// @ApiModelProperty(value = "接收状态（包括接收相关状态和检测完成状态）", dataType = "String") +// private String receiveStatus; + + @ApiModelProperty(value = "任务单状态", dataType = "String") + private String orderStatus; @ApiModelProperty(value = "是否现场检定") private Integer isOnSiteCheck; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java index f17b7a7..3e92a46 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java @@ -57,13 +57,30 @@ @ApiModelProperty(value = "接收状态名称", dataType = "String") private String receiveStatusName; + @ApiModelProperty(value = "任务单状态", dataType = "String") + @DictCodeField(message = "任务单状态不合法", cacheName = MeterDictCode.EQPT_ORDER_STATUS) + @TableField(exist = false) + private String orderStatus; + + @TableField(exist = false) + @ApiModelProperty(value = "任务单状态名称", dataType = "String") + private String orderStatusName; + + @TableField(exist = false) + @ApiModelProperty(hidden = true) + private Integer unBackCount; + + @ApiModelProperty(value = "创建人名字", dataType = "String") private String createUserName; @ApiModelProperty(value = "创建时间", dataType = "String") private String createTime; - @ApiModelProperty(value = "计划送检时间", dataType = "String") + @ApiModelProperty(value = "要求检完时间", dataType = "String") private String requireOverTime; + @ApiModelProperty(value = "预计送达时间", dataType = "String") + private String planDeliverTime; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java index 5773c4e..be0e35a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java @@ -40,6 +40,14 @@ @ApiModelProperty("使用状态名称") private String usageStatusName; + + @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_CHECK_DESTINATION,needValid = true,message = "检定去向不合法") + @ApiModelProperty(value = "检定去向",notes = "检定去向") + private String checkDestination; + + @ApiModelProperty("检定去向名称") + private String checkDestinationName; + @ApiModelProperty("计量标识") @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_METER_IDENTITY) private String meterIdentify; @@ -57,4 +65,7 @@ @ApiModelProperty("检定状态名称") private String checkStatusName; + + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java index 74e2d2a..ed74deb 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java @@ -167,6 +167,16 @@ @ApiModelProperty(value = "接收状态名称", dataType = "String") private String receiveStatusName; + + @ApiModelProperty(value = "任务单状态", dataType = "String") + @DictCodeField(message = "任务单状态不合法", cacheName = MeterDictCode.EQPT_ORDER_STATUS) + @TableField(exist = false) + private String orderStatus; + + @TableField(exist = false) + @ApiModelProperty(value = "任务单状态名称", dataType = "String") + private String orderStatusName; + /** * 接收说明 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java index 381fa37..badaaab 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java @@ -81,13 +81,13 @@ @TableField(exist = false) - @ApiModelProperty("接收状态名称") + @ApiModelProperty("样品状态名称") private String sampleStatusName; /** * 样品在本次委托中的备注 */ - @ApiModelProperty(value = "样品在本次委托中的备注", dataType = "String") + @ApiModelProperty(value = "样品在本次委托中的备注（退回/补送原因，接收状态说明）", dataType = "String") @TableField("remark") private String remark; @@ -140,7 +140,23 @@ @TableField("measure_content") private String measureContent; - @ApiModelProperty(value = "检定完成度", dataType = "String") + @ApiModelProperty(value = "接收状态") + @TableField(exist = false) + private String receiveStatusName; + + public String getReceiveStatusName() { + if("1".equals(sampleStatus)){ + return "未接收"; + }else if("9".equals(sampleStatus)){ + return "待补送"; + }else if("10".equals(sampleStatus)){ + return "已退回"; + }else { + return "已接收"; + } + } + + @ApiModelProperty(value = "检定完成度(检定结果)", dataType = "String") @TableField(exist = false) private String measureCompletePercent; @@ -150,7 +166,7 @@ } else if("3".equals(sampleStatus) || "4".equals(sampleStatus) || "8".equals(sampleStatus)){ return "检定中"; } else if("5".equals(sampleStatus) || "6".equals(sampleStatus)){ - return "检定完"; + return "已检完"; } else if("10".equals(sampleStatus)){ return "已退回"; } @@ -161,6 +177,14 @@ @TableField("measure_complete_time") private String measureCompleteTime; + @ApiModelProperty("检定结果附加（合格/不合格/退回）") + @TableField(exist = false) + private String conclusion; + + @ApiModelProperty("检定说明") + @TableField(exist = false) + private String measureRemark; + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index a31f9c1..470135e 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java new file mode 100644 index 0000000..fda9f0d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java @@ -0,0 +1,13 @@ +package com.casic.missiles.enums.plan; + +import liquibase.pro.packaged.S; + +public interface OrderStatusEnum { + + String RECEIVE_STATUS_COMPLETE = "4"; // 接收状态-检测完成 + + + String ORDER_STATUS_TO_BACK = "6"; // 任务单状态 - 待取回 + + String ORDER_STATUS_BACKED = "7"; // 任务单状态 - 已取回 +} diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index d52996f..993d279 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 359c1f2..36aa2ed 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; import com.casic.missiles.model.business.BizBusinessOrderSampleRelation; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -36,4 +37,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + @Select("select conclusion from biz_business_device_measure_info where order_id = #{orderId} and sample_id = #{sampleId} order by id desc limit 1") + String getConclusion(@Param("orderId")Long orderId,@Param("sampleId")Long sampleId); + + @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") + Integer getUnBackCount(@Param("orderId")Long orderId); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml index e4a103f..5f5886b 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml @@ -42,7 +42,7 @@ select * from ( SELECT * --- ,(select dept_id from sys_user where id = create_user_id) as dept_id + ,(select count(*) from biz_business_order_sample_relation relation where relation.order_id = biz_business_order_info.id and sample_status='5') as unBackCount FROM biz_business_order_info ) t diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 3335fec..1bb8180 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-job - 1.3.2.0 + 1.3.3.0 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 3dcc2aa..4e4fd24 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -52,13 +52,13 @@ @GetMapping("/listPage") @ResponseBody public ReturnDTO> listPage(String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo, String equipmentManufacturer, String certificateValidStart,String certificateValidEnd, String checkDateStart, String checkDateEnd) { Page page = PageFactory.defaultPage(); - page = certificateService.listScopePage(page, certificateNo, certificateName, equipmentNo, equipmentName, + page = certificateService.listScopePage(page, certificateNo, certificateName, equipmentNo, equipmentName,equipmentModel, subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo,equipmentManufacturer, certificateValidStart,certificateValidEnd,checkDateStart,checkDateEnd); @@ -69,14 +69,14 @@ @PostMapping("/export") @ResponseBody public void export(String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo,String equipmentManufacturer, String certificateValidStart,String certificateValidEnd, String checkDateStart, String checkDateEnd, @RequestParam("ids") List ids) throws IOException { List list = certificateService.listScope(certificateNo, certificateName, equipmentNo, - equipmentName, subcontractorName, createTimeStart, createTimeEnd, + equipmentName, equipmentModel,subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo,equipmentManufacturer, certificateValidStart,certificateValidEnd,checkDateStart,checkDateEnd, ids); diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 0411c27..bae3416 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.2.0 + 1.3.3.0 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index a18b82c..731b0bc 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 8296d60..64b9c20 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -46,6 +46,8 @@ String PLAN_EXECUTE_STATUS = DICT_PREFIX + "PlanExecuteStatus"; // 计量计划检定完成度 String PLAN_CHECK_COMPLETION = DICT_PREFIX + "PlanCheckCompletion"; + + String EQPT_ORDER_STATUS = DICT_PREFIX + "TaskStatus"; // 文档变更类型 String FILE_LOG_TYPE = DICT_PREFIX + "FileLogType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java index 7de9c2d..c300fc1 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java @@ -39,8 +39,11 @@ @ApiModelProperty(value = "出厂编号") private String manufactureNo; - @ApiModelProperty(value = "接收状态（包括接收相关状态和检测完成状态）", dataType = "String") - private String receiveStatus; +// @ApiModelProperty(value = "接收状态（包括接收相关状态和检测完成状态）", dataType = "String") +// private String receiveStatus; + + @ApiModelProperty(value = "任务单状态", dataType = "String") + private String orderStatus; @ApiModelProperty(value = "是否现场检定") private Integer isOnSiteCheck; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java index f17b7a7..3e92a46 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java @@ -57,13 +57,30 @@ @ApiModelProperty(value = "接收状态名称", dataType = "String") private String receiveStatusName; + @ApiModelProperty(value = "任务单状态", dataType = "String") + @DictCodeField(message = "任务单状态不合法", cacheName = MeterDictCode.EQPT_ORDER_STATUS) + @TableField(exist = false) + private String orderStatus; + + @TableField(exist = false) + @ApiModelProperty(value = "任务单状态名称", dataType = "String") + private String orderStatusName; + + @TableField(exist = false) + @ApiModelProperty(hidden = true) + private Integer unBackCount; + + @ApiModelProperty(value = "创建人名字", dataType = "String") private String createUserName; @ApiModelProperty(value = "创建时间", dataType = "String") private String createTime; - @ApiModelProperty(value = "计划送检时间", dataType = "String") + @ApiModelProperty(value = "要求检完时间", dataType = "String") private String requireOverTime; + @ApiModelProperty(value = "预计送达时间", dataType = "String") + private String planDeliverTime; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java index 5773c4e..be0e35a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java @@ -40,6 +40,14 @@ @ApiModelProperty("使用状态名称") private String usageStatusName; + + @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_CHECK_DESTINATION,needValid = true,message = "检定去向不合法") + @ApiModelProperty(value = "检定去向",notes = "检定去向") + private String checkDestination; + + @ApiModelProperty("检定去向名称") + private String checkDestinationName; + @ApiModelProperty("计量标识") @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_METER_IDENTITY) private String meterIdentify; @@ -57,4 +65,7 @@ @ApiModelProperty("检定状态名称") private String checkStatusName; + + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java index 74e2d2a..ed74deb 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java @@ -167,6 +167,16 @@ @ApiModelProperty(value = "接收状态名称", dataType = "String") private String receiveStatusName; + + @ApiModelProperty(value = "任务单状态", dataType = "String") + @DictCodeField(message = "任务单状态不合法", cacheName = MeterDictCode.EQPT_ORDER_STATUS) + @TableField(exist = false) + private String orderStatus; + + @TableField(exist = false) + @ApiModelProperty(value = "任务单状态名称", dataType = "String") + private String orderStatusName; + /** * 接收说明 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java index 381fa37..badaaab 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java @@ -81,13 +81,13 @@ @TableField(exist = false) - @ApiModelProperty("接收状态名称") + @ApiModelProperty("样品状态名称") private String sampleStatusName; /** * 样品在本次委托中的备注 */ - @ApiModelProperty(value = "样品在本次委托中的备注", dataType = "String") + @ApiModelProperty(value = "样品在本次委托中的备注（退回/补送原因，接收状态说明）", dataType = "String") @TableField("remark") private String remark; @@ -140,7 +140,23 @@ @TableField("measure_content") private String measureContent; - @ApiModelProperty(value = "检定完成度", dataType = "String") + @ApiModelProperty(value = "接收状态") + @TableField(exist = false) + private String receiveStatusName; + + public String getReceiveStatusName() { + if("1".equals(sampleStatus)){ + return "未接收"; + }else if("9".equals(sampleStatus)){ + return "待补送"; + }else if("10".equals(sampleStatus)){ + return "已退回"; + }else { + return "已接收"; + } + } + + @ApiModelProperty(value = "检定完成度(检定结果)", dataType = "String") @TableField(exist = false) private String measureCompletePercent; @@ -150,7 +166,7 @@ } else if("3".equals(sampleStatus) || "4".equals(sampleStatus) || "8".equals(sampleStatus)){ return "检定中"; } else if("5".equals(sampleStatus) || "6".equals(sampleStatus)){ - return "检定完"; + return "已检完"; } else if("10".equals(sampleStatus)){ return "已退回"; } @@ -161,6 +177,14 @@ @TableField("measure_complete_time") private String measureCompleteTime; + @ApiModelProperty("检定结果附加（合格/不合格/退回）") + @TableField(exist = false) + private String conclusion; + + @ApiModelProperty("检定说明") + @TableField(exist = false) + private String measureRemark; + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index cbe6893..edcb882 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-common - 1.3.2.0 + 1.3.3.0 org.springframework.boot diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index a31f9c1..470135e 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java new file mode 100644 index 0000000..fda9f0d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java @@ -0,0 +1,13 @@ +package com.casic.missiles.enums.plan; + +import liquibase.pro.packaged.S; + +public interface OrderStatusEnum { + + String RECEIVE_STATUS_COMPLETE = "4"; // 接收状态-检测完成 + + + String ORDER_STATUS_TO_BACK = "6"; // 任务单状态 - 待取回 + + String ORDER_STATUS_BACKED = "7"; // 任务单状态 - 已取回 +} diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index d52996f..993d279 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 359c1f2..36aa2ed 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; import com.casic.missiles.model.business.BizBusinessOrderSampleRelation; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -36,4 +37,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + @Select("select conclusion from biz_business_device_measure_info where order_id = #{orderId} and sample_id = #{sampleId} order by id desc limit 1") + String getConclusion(@Param("orderId")Long orderId,@Param("sampleId")Long sampleId); + + @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") + Integer getUnBackCount(@Param("orderId")Long orderId); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml index e4a103f..5f5886b 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml @@ -42,7 +42,7 @@ select * from ( SELECT * --- ,(select dept_id from sys_user where id = create_user_id) as dept_id + ,(select count(*) from biz_business_order_sample_relation relation where relation.order_id = biz_business_order_info.id and sample_status='5') as unBackCount FROM biz_business_order_info ) t diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 3335fec..1bb8180 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-job - 1.3.2.0 + 1.3.3.0 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 3dcc2aa..4e4fd24 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -52,13 +52,13 @@ @GetMapping("/listPage") @ResponseBody public ReturnDTO> listPage(String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo, String equipmentManufacturer, String certificateValidStart,String certificateValidEnd, String checkDateStart, String checkDateEnd) { Page page = PageFactory.defaultPage(); - page = certificateService.listScopePage(page, certificateNo, certificateName, equipmentNo, equipmentName, + page = certificateService.listScopePage(page, certificateNo, certificateName, equipmentNo, equipmentName,equipmentModel, subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo,equipmentManufacturer, certificateValidStart,certificateValidEnd,checkDateStart,checkDateEnd); @@ -69,14 +69,14 @@ @PostMapping("/export") @ResponseBody public void export(String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo,String equipmentManufacturer, String certificateValidStart,String certificateValidEnd, String checkDateStart, String checkDateEnd, @RequestParam("ids") List ids) throws IOException { List list = certificateService.listScope(certificateNo, certificateName, equipmentNo, - equipmentName, subcontractorName, createTimeStart, createTimeEnd, + equipmentName, equipmentModel,subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo,equipmentManufacturer, certificateValidStart,certificateValidEnd,checkDateStart,checkDateEnd, ids); diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 0411c27..bae3416 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.2.0 + 1.3.3.0 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index a18b82c..731b0bc 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 8296d60..64b9c20 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -46,6 +46,8 @@ String PLAN_EXECUTE_STATUS = DICT_PREFIX + "PlanExecuteStatus"; // 计量计划检定完成度 String PLAN_CHECK_COMPLETION = DICT_PREFIX + "PlanCheckCompletion"; + + String EQPT_ORDER_STATUS = DICT_PREFIX + "TaskStatus"; // 文档变更类型 String FILE_LOG_TYPE = DICT_PREFIX + "FileLogType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java index 7de9c2d..c300fc1 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java @@ -39,8 +39,11 @@ @ApiModelProperty(value = "出厂编号") private String manufactureNo; - @ApiModelProperty(value = "接收状态（包括接收相关状态和检测完成状态）", dataType = "String") - private String receiveStatus; +// @ApiModelProperty(value = "接收状态（包括接收相关状态和检测完成状态）", dataType = "String") +// private String receiveStatus; + + @ApiModelProperty(value = "任务单状态", dataType = "String") + private String orderStatus; @ApiModelProperty(value = "是否现场检定") private Integer isOnSiteCheck; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java index f17b7a7..3e92a46 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java @@ -57,13 +57,30 @@ @ApiModelProperty(value = "接收状态名称", dataType = "String") private String receiveStatusName; + @ApiModelProperty(value = "任务单状态", dataType = "String") + @DictCodeField(message = "任务单状态不合法", cacheName = MeterDictCode.EQPT_ORDER_STATUS) + @TableField(exist = false) + private String orderStatus; + + @TableField(exist = false) + @ApiModelProperty(value = "任务单状态名称", dataType = "String") + private String orderStatusName; + + @TableField(exist = false) + @ApiModelProperty(hidden = true) + private Integer unBackCount; + + @ApiModelProperty(value = "创建人名字", dataType = "String") private String createUserName; @ApiModelProperty(value = "创建时间", dataType = "String") private String createTime; - @ApiModelProperty(value = "计划送检时间", dataType = "String") + @ApiModelProperty(value = "要求检完时间", dataType = "String") private String requireOverTime; + @ApiModelProperty(value = "预计送达时间", dataType = "String") + private String planDeliverTime; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java index 5773c4e..be0e35a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java @@ -40,6 +40,14 @@ @ApiModelProperty("使用状态名称") private String usageStatusName; + + @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_CHECK_DESTINATION,needValid = true,message = "检定去向不合法") + @ApiModelProperty(value = "检定去向",notes = "检定去向") + private String checkDestination; + + @ApiModelProperty("检定去向名称") + private String checkDestinationName; + @ApiModelProperty("计量标识") @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_METER_IDENTITY) private String meterIdentify; @@ -57,4 +65,7 @@ @ApiModelProperty("检定状态名称") private String checkStatusName; + + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java index 74e2d2a..ed74deb 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java @@ -167,6 +167,16 @@ @ApiModelProperty(value = "接收状态名称", dataType = "String") private String receiveStatusName; + + @ApiModelProperty(value = "任务单状态", dataType = "String") + @DictCodeField(message = "任务单状态不合法", cacheName = MeterDictCode.EQPT_ORDER_STATUS) + @TableField(exist = false) + private String orderStatus; + + @TableField(exist = false) + @ApiModelProperty(value = "任务单状态名称", dataType = "String") + private String orderStatusName; + /** * 接收说明 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java index 381fa37..badaaab 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java @@ -81,13 +81,13 @@ @TableField(exist = false) - @ApiModelProperty("接收状态名称") + @ApiModelProperty("样品状态名称") private String sampleStatusName; /** * 样品在本次委托中的备注 */ - @ApiModelProperty(value = "样品在本次委托中的备注", dataType = "String") + @ApiModelProperty(value = "样品在本次委托中的备注（退回/补送原因，接收状态说明）", dataType = "String") @TableField("remark") private String remark; @@ -140,7 +140,23 @@ @TableField("measure_content") private String measureContent; - @ApiModelProperty(value = "检定完成度", dataType = "String") + @ApiModelProperty(value = "接收状态") + @TableField(exist = false) + private String receiveStatusName; + + public String getReceiveStatusName() { + if("1".equals(sampleStatus)){ + return "未接收"; + }else if("9".equals(sampleStatus)){ + return "待补送"; + }else if("10".equals(sampleStatus)){ + return "已退回"; + }else { + return "已接收"; + } + } + + @ApiModelProperty(value = "检定完成度(检定结果)", dataType = "String") @TableField(exist = false) private String measureCompletePercent; @@ -150,7 +166,7 @@ } else if("3".equals(sampleStatus) || "4".equals(sampleStatus) || "8".equals(sampleStatus)){ return "检定中"; } else if("5".equals(sampleStatus) || "6".equals(sampleStatus)){ - return "检定完"; + return "已检完"; } else if("10".equals(sampleStatus)){ return "已退回"; } @@ -161,6 +177,14 @@ @TableField("measure_complete_time") private String measureCompleteTime; + @ApiModelProperty("检定结果附加（合格/不合格/退回）") + @TableField(exist = false) + private String conclusion; + + @ApiModelProperty("检定说明") + @TableField(exist = false) + private String measureRemark; + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index cbe6893..edcb882 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-common - 1.3.2.0 + 1.3.3.0 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java index 569773a..1cc3e68 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.business.MeasureTypeEnum; import com.casic.missiles.enums.business.OrderStatusDictEnum; +import com.casic.missiles.enums.plan.CheckCompletionEnum; +import com.casic.missiles.enums.plan.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessOrderInfoMapper; import com.casic.missiles.mapper.business.BizBusinessOrderSampleRelationMapper; @@ -71,24 +73,79 @@ List list = orderListResponseMapper.listPage(page, wrapper); page.setRecords(list); for (OrderListResponse customerAdviceInfo : page.getRecords()) { - DictCodeUtils.convertDictCodeToName(customerAdviceInfo); + customerAdviceInfo.setDeptName(systemDeptService.getParentsDeptName(customerAdviceInfo.getDeptId())); + + if(StrUtil.isNotEmpty(customerAdviceInfo.getReceiveStatus())){ + customerAdviceInfo.setOrderStatus(customerAdviceInfo.getReceiveStatus()); + if(OrderStatusEnum.RECEIVE_STATUS_COMPLETE.equals(customerAdviceInfo.getReceiveStatus())){ + if(customerAdviceInfo.getUnBackCount() > 0){ + customerAdviceInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_TO_BACK); + }else { + customerAdviceInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_BACKED); + } + } + } + + if(StrUtil.isNotEmpty(customerAdviceInfo.getRequireOverTime())){ + customerAdviceInfo.setRequireOverTime(customerAdviceInfo.getRequireOverTime().substring(0,10)); + } + if(StrUtil.isNotEmpty(customerAdviceInfo.getPlanDeliverTime())){ + customerAdviceInfo.setPlanDeliverTime(customerAdviceInfo.getPlanDeliverTime().substring(0,10)); + } + + DictCodeUtils.convertDictCodeToName(customerAdviceInfo); } return page; } + private String getConclusion(Long orderId,Long sampleId){ + String conclusion = sampleRelationMapper.getConclusion(orderId,sampleId); + if(StrUtil.isNotBlank(conclusion)){ + if(conclusion.contains("不合格")){ + return "不合格"; + }else if(conclusion.contains("其余所检项目合格")){ + return "限用"; + }else { + return "合格"; + } + } + return conclusion; + } + @Override public ReturnDTO orderDetail(Long id) throws Exception { // todo 交接单编号及pdf打印 BizBusinessOrderInfo orderInfo = this.baseMapper.selectById(id); + + if(StrUtil.isNotEmpty(orderInfo.getReceiveStatus())){ + orderInfo.setOrderStatus(orderInfo.getReceiveStatus()); + if(OrderStatusEnum.RECEIVE_STATUS_COMPLETE.equals(orderInfo.getReceiveStatus())){ + Integer unBackCount = sampleRelationMapper.getUnBackCount(id); + if(unBackCount > 0){ + orderInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_TO_BACK); + }else { + orderInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_BACKED); + } + } + } + DictCodeUtils.convertDictCodeToName(orderInfo); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.select("*","(select manufacturer from eqpt_equipment_info e where e.id = sample_id) as sampleManufacturer" - ,"(select manufacture_no from eqpt_equipment_info e where e.id = sample_id) as sampleManufactureNo"); + ,"(select manufacture_no from eqpt_equipment_info e where e.id = sample_id) as sampleManufactureNo" + ,"(select GROUP_CONCAT(remark) from biz_business_device_measure_info m where m.sample_id = biz_business_order_sample_relation.sample_id" + + " AND m.order_id = biz_business_order_sample_relation.order_id ) as measureRemark"); wrapper.eq("order_id", orderInfo.getId()); List orderSampleList = sampleRelationMapper.selectList(wrapper); - for (BizBusinessOrderSampleRelation bizBusinessOrderSampleRelation : orderSampleList) { - DictCodeUtils.convertDictCodeToName(bizBusinessOrderSampleRelation); + for (BizBusinessOrderSampleRelation relation : orderSampleList) { + if(StrUtil.isNotEmpty(relation.getMeasureCompleteTime())){ + relation.setMeasureCompleteTime(relation.getMeasureCompleteTime().substring(0,10)); + } + if("已检完".equals(relation.getMeasureCompletePercent())){ + relation.setConclusion(getConclusion(relation.getOrderId(), relation.getSampleId())); + } + DictCodeUtils.convertDictCodeToName(relation); } orderInfo.setCustomerSampleInfoList(orderSampleList); return ReturnUtil.success(orderInfo); @@ -179,9 +236,21 @@ } wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()),"measure_company",request.getMeasureCompany()); - wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus()); +// wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus()); wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()),"is_on_site_check",request.getIsOnSiteCheck()); + if(StrUtil.isNotEmpty(request.getOrderStatus())){ + if(OrderStatusEnum.ORDER_STATUS_TO_BACK.equals(request.getOrderStatus())){ + wrapper.eq("receive_status",OrderStatusEnum.RECEIVE_STATUS_COMPLETE); + wrapper.gt("unBackCount",0); + }else if(OrderStatusEnum.ORDER_STATUS_BACKED.equals(request.getOrderStatus())){ + wrapper.eq("receive_status",OrderStatusEnum.RECEIVE_STATUS_COMPLETE); + wrapper.le("unBackCount",0); + }else { + wrapper.eq("receive_status",request.getOrderStatus()); + } + } + if(ObjectUtil.isNotEmpty(request.getUsePositionId())){ String positionSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.use_position_id = %s)",request.getUsePositionId()); wrapper.exists(positionSql); diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index a31f9c1..470135e 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java new file mode 100644 index 0000000..fda9f0d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java @@ -0,0 +1,13 @@ +package com.casic.missiles.enums.plan; + +import liquibase.pro.packaged.S; + +public interface OrderStatusEnum { + + String RECEIVE_STATUS_COMPLETE = "4"; // 接收状态-检测完成 + + + String ORDER_STATUS_TO_BACK = "6"; // 任务单状态 - 待取回 + + String ORDER_STATUS_BACKED = "7"; // 任务单状态 - 已取回 +} diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index d52996f..993d279 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 359c1f2..36aa2ed 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; import com.casic.missiles.model.business.BizBusinessOrderSampleRelation; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -36,4 +37,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + @Select("select conclusion from biz_business_device_measure_info where order_id = #{orderId} and sample_id = #{sampleId} order by id desc limit 1") + String getConclusion(@Param("orderId")Long orderId,@Param("sampleId")Long sampleId); + + @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") + Integer getUnBackCount(@Param("orderId")Long orderId); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml index e4a103f..5f5886b 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml @@ -42,7 +42,7 @@ select * from ( SELECT * --- ,(select dept_id from sys_user where id = create_user_id) as dept_id + ,(select count(*) from biz_business_order_sample_relation relation where relation.order_id = biz_business_order_info.id and sample_status='5') as unBackCount FROM biz_business_order_info ) t diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 3335fec..1bb8180 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-job - 1.3.2.0 + 1.3.3.0 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 3dcc2aa..4e4fd24 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -52,13 +52,13 @@ @GetMapping("/listPage") @ResponseBody public ReturnDTO> listPage(String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo, String equipmentManufacturer, String certificateValidStart,String certificateValidEnd, String checkDateStart, String checkDateEnd) { Page page = PageFactory.defaultPage(); - page = certificateService.listScopePage(page, certificateNo, certificateName, equipmentNo, equipmentName, + page = certificateService.listScopePage(page, certificateNo, certificateName, equipmentNo, equipmentName,equipmentModel, subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo,equipmentManufacturer, certificateValidStart,certificateValidEnd,checkDateStart,checkDateEnd); @@ -69,14 +69,14 @@ @PostMapping("/export") @ResponseBody public void export(String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo,String equipmentManufacturer, String certificateValidStart,String certificateValidEnd, String checkDateStart, String checkDateEnd, @RequestParam("ids") List ids) throws IOException { List list = certificateService.listScope(certificateNo, certificateName, equipmentNo, - equipmentName, subcontractorName, createTimeStart, createTimeEnd, + equipmentName, equipmentModel,subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo,equipmentManufacturer, certificateValidStart,certificateValidEnd,checkDateStart,checkDateEnd, ids); diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 0411c27..bae3416 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.2.0 + 1.3.3.0 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index a18b82c..731b0bc 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 8296d60..64b9c20 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -46,6 +46,8 @@ String PLAN_EXECUTE_STATUS = DICT_PREFIX + "PlanExecuteStatus"; // 计量计划检定完成度 String PLAN_CHECK_COMPLETION = DICT_PREFIX + "PlanCheckCompletion"; + + String EQPT_ORDER_STATUS = DICT_PREFIX + "TaskStatus"; // 文档变更类型 String FILE_LOG_TYPE = DICT_PREFIX + "FileLogType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java index 7de9c2d..c300fc1 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java @@ -39,8 +39,11 @@ @ApiModelProperty(value = "出厂编号") private String manufactureNo; - @ApiModelProperty(value = "接收状态（包括接收相关状态和检测完成状态）", dataType = "String") - private String receiveStatus; +// @ApiModelProperty(value = "接收状态（包括接收相关状态和检测完成状态）", dataType = "String") +// private String receiveStatus; + + @ApiModelProperty(value = "任务单状态", dataType = "String") + private String orderStatus; @ApiModelProperty(value = "是否现场检定") private Integer isOnSiteCheck; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java index f17b7a7..3e92a46 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java @@ -57,13 +57,30 @@ @ApiModelProperty(value = "接收状态名称", dataType = "String") private String receiveStatusName; + @ApiModelProperty(value = "任务单状态", dataType = "String") + @DictCodeField(message = "任务单状态不合法", cacheName = MeterDictCode.EQPT_ORDER_STATUS) + @TableField(exist = false) + private String orderStatus; + + @TableField(exist = false) + @ApiModelProperty(value = "任务单状态名称", dataType = "String") + private String orderStatusName; + + @TableField(exist = false) + @ApiModelProperty(hidden = true) + private Integer unBackCount; + + @ApiModelProperty(value = "创建人名字", dataType = "String") private String createUserName; @ApiModelProperty(value = "创建时间", dataType = "String") private String createTime; - @ApiModelProperty(value = "计划送检时间", dataType = "String") + @ApiModelProperty(value = "要求检完时间", dataType = "String") private String requireOverTime; + @ApiModelProperty(value = "预计送达时间", dataType = "String") + private String planDeliverTime; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java index 5773c4e..be0e35a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java @@ -40,6 +40,14 @@ @ApiModelProperty("使用状态名称") private String usageStatusName; + + @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_CHECK_DESTINATION,needValid = true,message = "检定去向不合法") + @ApiModelProperty(value = "检定去向",notes = "检定去向") + private String checkDestination; + + @ApiModelProperty("检定去向名称") + private String checkDestinationName; + @ApiModelProperty("计量标识") @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_METER_IDENTITY) private String meterIdentify; @@ -57,4 +65,7 @@ @ApiModelProperty("检定状态名称") private String checkStatusName; + + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java index 74e2d2a..ed74deb 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java @@ -167,6 +167,16 @@ @ApiModelProperty(value = "接收状态名称", dataType = "String") private String receiveStatusName; + + @ApiModelProperty(value = "任务单状态", dataType = "String") + @DictCodeField(message = "任务单状态不合法", cacheName = MeterDictCode.EQPT_ORDER_STATUS) + @TableField(exist = false) + private String orderStatus; + + @TableField(exist = false) + @ApiModelProperty(value = "任务单状态名称", dataType = "String") + private String orderStatusName; + /** * 接收说明 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java index 381fa37..badaaab 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java @@ -81,13 +81,13 @@ @TableField(exist = false) - @ApiModelProperty("接收状态名称") + @ApiModelProperty("样品状态名称") private String sampleStatusName; /** * 样品在本次委托中的备注 */ - @ApiModelProperty(value = "样品在本次委托中的备注", dataType = "String") + @ApiModelProperty(value = "样品在本次委托中的备注（退回/补送原因，接收状态说明）", dataType = "String") @TableField("remark") private String remark; @@ -140,7 +140,23 @@ @TableField("measure_content") private String measureContent; - @ApiModelProperty(value = "检定完成度", dataType = "String") + @ApiModelProperty(value = "接收状态") + @TableField(exist = false) + private String receiveStatusName; + + public String getReceiveStatusName() { + if("1".equals(sampleStatus)){ + return "未接收"; + }else if("9".equals(sampleStatus)){ + return "待补送"; + }else if("10".equals(sampleStatus)){ + return "已退回"; + }else { + return "已接收"; + } + } + + @ApiModelProperty(value = "检定完成度(检定结果)", dataType = "String") @TableField(exist = false) private String measureCompletePercent; @@ -150,7 +166,7 @@ } else if("3".equals(sampleStatus) || "4".equals(sampleStatus) || "8".equals(sampleStatus)){ return "检定中"; } else if("5".equals(sampleStatus) || "6".equals(sampleStatus)){ - return "检定完"; + return "已检完"; } else if("10".equals(sampleStatus)){ return "已退回"; } @@ -161,6 +177,14 @@ @TableField("measure_complete_time") private String measureCompleteTime; + @ApiModelProperty("检定结果附加（合格/不合格/退回）") + @TableField(exist = false) + private String conclusion; + + @ApiModelProperty("检定说明") + @TableField(exist = false) + private String measureRemark; + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index cbe6893..edcb882 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-common - 1.3.2.0 + 1.3.3.0 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java index 569773a..1cc3e68 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.business.MeasureTypeEnum; import com.casic.missiles.enums.business.OrderStatusDictEnum; +import com.casic.missiles.enums.plan.CheckCompletionEnum; +import com.casic.missiles.enums.plan.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessOrderInfoMapper; import com.casic.missiles.mapper.business.BizBusinessOrderSampleRelationMapper; @@ -71,24 +73,79 @@ List list = orderListResponseMapper.listPage(page, wrapper); page.setRecords(list); for (OrderListResponse customerAdviceInfo : page.getRecords()) { - DictCodeUtils.convertDictCodeToName(customerAdviceInfo); + customerAdviceInfo.setDeptName(systemDeptService.getParentsDeptName(customerAdviceInfo.getDeptId())); + + if(StrUtil.isNotEmpty(customerAdviceInfo.getReceiveStatus())){ + customerAdviceInfo.setOrderStatus(customerAdviceInfo.getReceiveStatus()); + if(OrderStatusEnum.RECEIVE_STATUS_COMPLETE.equals(customerAdviceInfo.getReceiveStatus())){ + if(customerAdviceInfo.getUnBackCount() > 0){ + customerAdviceInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_TO_BACK); + }else { + customerAdviceInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_BACKED); + } + } + } + + if(StrUtil.isNotEmpty(customerAdviceInfo.getRequireOverTime())){ + customerAdviceInfo.setRequireOverTime(customerAdviceInfo.getRequireOverTime().substring(0,10)); + } + if(StrUtil.isNotEmpty(customerAdviceInfo.getPlanDeliverTime())){ + customerAdviceInfo.setPlanDeliverTime(customerAdviceInfo.getPlanDeliverTime().substring(0,10)); + } + + DictCodeUtils.convertDictCodeToName(customerAdviceInfo); } return page; } + private String getConclusion(Long orderId,Long sampleId){ + String conclusion = sampleRelationMapper.getConclusion(orderId,sampleId); + if(StrUtil.isNotBlank(conclusion)){ + if(conclusion.contains("不合格")){ + return "不合格"; + }else if(conclusion.contains("其余所检项目合格")){ + return "限用"; + }else { + return "合格"; + } + } + return conclusion; + } + @Override public ReturnDTO orderDetail(Long id) throws Exception { // todo 交接单编号及pdf打印 BizBusinessOrderInfo orderInfo = this.baseMapper.selectById(id); + + if(StrUtil.isNotEmpty(orderInfo.getReceiveStatus())){ + orderInfo.setOrderStatus(orderInfo.getReceiveStatus()); + if(OrderStatusEnum.RECEIVE_STATUS_COMPLETE.equals(orderInfo.getReceiveStatus())){ + Integer unBackCount = sampleRelationMapper.getUnBackCount(id); + if(unBackCount > 0){ + orderInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_TO_BACK); + }else { + orderInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_BACKED); + } + } + } + DictCodeUtils.convertDictCodeToName(orderInfo); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.select("*","(select manufacturer from eqpt_equipment_info e where e.id = sample_id) as sampleManufacturer" - ,"(select manufacture_no from eqpt_equipment_info e where e.id = sample_id) as sampleManufactureNo"); + ,"(select manufacture_no from eqpt_equipment_info e where e.id = sample_id) as sampleManufactureNo" + ,"(select GROUP_CONCAT(remark) from biz_business_device_measure_info m where m.sample_id = biz_business_order_sample_relation.sample_id" + + " AND m.order_id = biz_business_order_sample_relation.order_id ) as measureRemark"); wrapper.eq("order_id", orderInfo.getId()); List orderSampleList = sampleRelationMapper.selectList(wrapper); - for (BizBusinessOrderSampleRelation bizBusinessOrderSampleRelation : orderSampleList) { - DictCodeUtils.convertDictCodeToName(bizBusinessOrderSampleRelation); + for (BizBusinessOrderSampleRelation relation : orderSampleList) { + if(StrUtil.isNotEmpty(relation.getMeasureCompleteTime())){ + relation.setMeasureCompleteTime(relation.getMeasureCompleteTime().substring(0,10)); + } + if("已检完".equals(relation.getMeasureCompletePercent())){ + relation.setConclusion(getConclusion(relation.getOrderId(), relation.getSampleId())); + } + DictCodeUtils.convertDictCodeToName(relation); } orderInfo.setCustomerSampleInfoList(orderSampleList); return ReturnUtil.success(orderInfo); @@ -179,9 +236,21 @@ } wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()),"measure_company",request.getMeasureCompany()); - wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus()); +// wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus()); wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()),"is_on_site_check",request.getIsOnSiteCheck()); + if(StrUtil.isNotEmpty(request.getOrderStatus())){ + if(OrderStatusEnum.ORDER_STATUS_TO_BACK.equals(request.getOrderStatus())){ + wrapper.eq("receive_status",OrderStatusEnum.RECEIVE_STATUS_COMPLETE); + wrapper.gt("unBackCount",0); + }else if(OrderStatusEnum.ORDER_STATUS_BACKED.equals(request.getOrderStatus())){ + wrapper.eq("receive_status",OrderStatusEnum.RECEIVE_STATUS_COMPLETE); + wrapper.le("unBackCount",0); + }else { + wrapper.eq("receive_status",request.getOrderStatus()); + } + } + if(ObjectUtil.isNotEmpty(request.getUsePositionId())){ String positionSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.use_position_id = %s)",request.getUsePositionId()); wrapper.exists(positionSql); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java index 7117130..f17c2d2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java @@ -161,7 +161,7 @@ wrapper.eq(ObjectUtil.isNotEmpty(request.getDeptId()),"create_dept_id",request.getDeptId()); wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()),"measure_company",request.getMeasureCompany()); - wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus()); +// wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus()); wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()),"is_on_site_check",request.getIsOnSiteCheck()); if(ObjectUtil.isNotEmpty(request.getUsePositionId())){ diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index a31f9c1..470135e 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java new file mode 100644 index 0000000..fda9f0d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java @@ -0,0 +1,13 @@ +package com.casic.missiles.enums.plan; + +import liquibase.pro.packaged.S; + +public interface OrderStatusEnum { + + String RECEIVE_STATUS_COMPLETE = "4"; // 接收状态-检测完成 + + + String ORDER_STATUS_TO_BACK = "6"; // 任务单状态 - 待取回 + + String ORDER_STATUS_BACKED = "7"; // 任务单状态 - 已取回 +} diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index d52996f..993d279 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 359c1f2..36aa2ed 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; import com.casic.missiles.model.business.BizBusinessOrderSampleRelation; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -36,4 +37,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + @Select("select conclusion from biz_business_device_measure_info where order_id = #{orderId} and sample_id = #{sampleId} order by id desc limit 1") + String getConclusion(@Param("orderId")Long orderId,@Param("sampleId")Long sampleId); + + @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") + Integer getUnBackCount(@Param("orderId")Long orderId); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml index e4a103f..5f5886b 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml @@ -42,7 +42,7 @@ select * from ( SELECT * --- ,(select dept_id from sys_user where id = create_user_id) as dept_id + ,(select count(*) from biz_business_order_sample_relation relation where relation.order_id = biz_business_order_info.id and sample_status='5') as unBackCount FROM biz_business_order_info ) t diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 3335fec..1bb8180 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-job - 1.3.2.0 + 1.3.3.0 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 3dcc2aa..4e4fd24 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -52,13 +52,13 @@ @GetMapping("/listPage") @ResponseBody public ReturnDTO> listPage(String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo, String equipmentManufacturer, String certificateValidStart,String certificateValidEnd, String checkDateStart, String checkDateEnd) { Page page = PageFactory.defaultPage(); - page = certificateService.listScopePage(page, certificateNo, certificateName, equipmentNo, equipmentName, + page = certificateService.listScopePage(page, certificateNo, certificateName, equipmentNo, equipmentName,equipmentModel, subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo,equipmentManufacturer, certificateValidStart,certificateValidEnd,checkDateStart,checkDateEnd); @@ -69,14 +69,14 @@ @PostMapping("/export") @ResponseBody public void export(String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo,String equipmentManufacturer, String certificateValidStart,String certificateValidEnd, String checkDateStart, String checkDateEnd, @RequestParam("ids") List ids) throws IOException { List list = certificateService.listScope(certificateNo, certificateName, equipmentNo, - equipmentName, subcontractorName, createTimeStart, createTimeEnd, + equipmentName, equipmentModel,subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo,equipmentManufacturer, certificateValidStart,certificateValidEnd,checkDateStart,checkDateEnd, ids); diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 0411c27..bae3416 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.2.0 + 1.3.3.0 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index a18b82c..731b0bc 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 8296d60..64b9c20 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -46,6 +46,8 @@ String PLAN_EXECUTE_STATUS = DICT_PREFIX + "PlanExecuteStatus"; // 计量计划检定完成度 String PLAN_CHECK_COMPLETION = DICT_PREFIX + "PlanCheckCompletion"; + + String EQPT_ORDER_STATUS = DICT_PREFIX + "TaskStatus"; // 文档变更类型 String FILE_LOG_TYPE = DICT_PREFIX + "FileLogType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java index 7de9c2d..c300fc1 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java @@ -39,8 +39,11 @@ @ApiModelProperty(value = "出厂编号") private String manufactureNo; - @ApiModelProperty(value = "接收状态（包括接收相关状态和检测完成状态）", dataType = "String") - private String receiveStatus; +// @ApiModelProperty(value = "接收状态（包括接收相关状态和检测完成状态）", dataType = "String") +// private String receiveStatus; + + @ApiModelProperty(value = "任务单状态", dataType = "String") + private String orderStatus; @ApiModelProperty(value = "是否现场检定") private Integer isOnSiteCheck; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java index f17b7a7..3e92a46 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java @@ -57,13 +57,30 @@ @ApiModelProperty(value = "接收状态名称", dataType = "String") private String receiveStatusName; + @ApiModelProperty(value = "任务单状态", dataType = "String") + @DictCodeField(message = "任务单状态不合法", cacheName = MeterDictCode.EQPT_ORDER_STATUS) + @TableField(exist = false) + private String orderStatus; + + @TableField(exist = false) + @ApiModelProperty(value = "任务单状态名称", dataType = "String") + private String orderStatusName; + + @TableField(exist = false) + @ApiModelProperty(hidden = true) + private Integer unBackCount; + + @ApiModelProperty(value = "创建人名字", dataType = "String") private String createUserName; @ApiModelProperty(value = "创建时间", dataType = "String") private String createTime; - @ApiModelProperty(value = "计划送检时间", dataType = "String") + @ApiModelProperty(value = "要求检完时间", dataType = "String") private String requireOverTime; + @ApiModelProperty(value = "预计送达时间", dataType = "String") + private String planDeliverTime; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java index 5773c4e..be0e35a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java @@ -40,6 +40,14 @@ @ApiModelProperty("使用状态名称") private String usageStatusName; + + @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_CHECK_DESTINATION,needValid = true,message = "检定去向不合法") + @ApiModelProperty(value = "检定去向",notes = "检定去向") + private String checkDestination; + + @ApiModelProperty("检定去向名称") + private String checkDestinationName; + @ApiModelProperty("计量标识") @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_METER_IDENTITY) private String meterIdentify; @@ -57,4 +65,7 @@ @ApiModelProperty("检定状态名称") private String checkStatusName; + + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java index 74e2d2a..ed74deb 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java @@ -167,6 +167,16 @@ @ApiModelProperty(value = "接收状态名称", dataType = "String") private String receiveStatusName; + + @ApiModelProperty(value = "任务单状态", dataType = "String") + @DictCodeField(message = "任务单状态不合法", cacheName = MeterDictCode.EQPT_ORDER_STATUS) + @TableField(exist = false) + private String orderStatus; + + @TableField(exist = false) + @ApiModelProperty(value = "任务单状态名称", dataType = "String") + private String orderStatusName; + /** * 接收说明 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java index 381fa37..badaaab 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java @@ -81,13 +81,13 @@ @TableField(exist = false) - @ApiModelProperty("接收状态名称") + @ApiModelProperty("样品状态名称") private String sampleStatusName; /** * 样品在本次委托中的备注 */ - @ApiModelProperty(value = "样品在本次委托中的备注", dataType = "String") + @ApiModelProperty(value = "样品在本次委托中的备注（退回/补送原因，接收状态说明）", dataType = "String") @TableField("remark") private String remark; @@ -140,7 +140,23 @@ @TableField("measure_content") private String measureContent; - @ApiModelProperty(value = "检定完成度", dataType = "String") + @ApiModelProperty(value = "接收状态") + @TableField(exist = false) + private String receiveStatusName; + + public String getReceiveStatusName() { + if("1".equals(sampleStatus)){ + return "未接收"; + }else if("9".equals(sampleStatus)){ + return "待补送"; + }else if("10".equals(sampleStatus)){ + return "已退回"; + }else { + return "已接收"; + } + } + + @ApiModelProperty(value = "检定完成度(检定结果)", dataType = "String") @TableField(exist = false) private String measureCompletePercent; @@ -150,7 +166,7 @@ } else if("3".equals(sampleStatus) || "4".equals(sampleStatus) || "8".equals(sampleStatus)){ return "检定中"; } else if("5".equals(sampleStatus) || "6".equals(sampleStatus)){ - return "检定完"; + return "已检完"; } else if("10".equals(sampleStatus)){ return "已退回"; } @@ -161,6 +177,14 @@ @TableField("measure_complete_time") private String measureCompleteTime; + @ApiModelProperty("检定结果附加（合格/不合格/退回）") + @TableField(exist = false) + private String conclusion; + + @ApiModelProperty("检定说明") + @TableField(exist = false) + private String measureRemark; + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index cbe6893..edcb882 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-common - 1.3.2.0 + 1.3.3.0 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java index 569773a..1cc3e68 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.business.MeasureTypeEnum; import com.casic.missiles.enums.business.OrderStatusDictEnum; +import com.casic.missiles.enums.plan.CheckCompletionEnum; +import com.casic.missiles.enums.plan.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessOrderInfoMapper; import com.casic.missiles.mapper.business.BizBusinessOrderSampleRelationMapper; @@ -71,24 +73,79 @@ List list = orderListResponseMapper.listPage(page, wrapper); page.setRecords(list); for (OrderListResponse customerAdviceInfo : page.getRecords()) { - DictCodeUtils.convertDictCodeToName(customerAdviceInfo); + customerAdviceInfo.setDeptName(systemDeptService.getParentsDeptName(customerAdviceInfo.getDeptId())); + + if(StrUtil.isNotEmpty(customerAdviceInfo.getReceiveStatus())){ + customerAdviceInfo.setOrderStatus(customerAdviceInfo.getReceiveStatus()); + if(OrderStatusEnum.RECEIVE_STATUS_COMPLETE.equals(customerAdviceInfo.getReceiveStatus())){ + if(customerAdviceInfo.getUnBackCount() > 0){ + customerAdviceInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_TO_BACK); + }else { + customerAdviceInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_BACKED); + } + } + } + + if(StrUtil.isNotEmpty(customerAdviceInfo.getRequireOverTime())){ + customerAdviceInfo.setRequireOverTime(customerAdviceInfo.getRequireOverTime().substring(0,10)); + } + if(StrUtil.isNotEmpty(customerAdviceInfo.getPlanDeliverTime())){ + customerAdviceInfo.setPlanDeliverTime(customerAdviceInfo.getPlanDeliverTime().substring(0,10)); + } + + DictCodeUtils.convertDictCodeToName(customerAdviceInfo); } return page; } + private String getConclusion(Long orderId,Long sampleId){ + String conclusion = sampleRelationMapper.getConclusion(orderId,sampleId); + if(StrUtil.isNotBlank(conclusion)){ + if(conclusion.contains("不合格")){ + return "不合格"; + }else if(conclusion.contains("其余所检项目合格")){ + return "限用"; + }else { + return "合格"; + } + } + return conclusion; + } + @Override public ReturnDTO orderDetail(Long id) throws Exception { // todo 交接单编号及pdf打印 BizBusinessOrderInfo orderInfo = this.baseMapper.selectById(id); + + if(StrUtil.isNotEmpty(orderInfo.getReceiveStatus())){ + orderInfo.setOrderStatus(orderInfo.getReceiveStatus()); + if(OrderStatusEnum.RECEIVE_STATUS_COMPLETE.equals(orderInfo.getReceiveStatus())){ + Integer unBackCount = sampleRelationMapper.getUnBackCount(id); + if(unBackCount > 0){ + orderInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_TO_BACK); + }else { + orderInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_BACKED); + } + } + } + DictCodeUtils.convertDictCodeToName(orderInfo); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.select("*","(select manufacturer from eqpt_equipment_info e where e.id = sample_id) as sampleManufacturer" - ,"(select manufacture_no from eqpt_equipment_info e where e.id = sample_id) as sampleManufactureNo"); + ,"(select manufacture_no from eqpt_equipment_info e where e.id = sample_id) as sampleManufactureNo" + ,"(select GROUP_CONCAT(remark) from biz_business_device_measure_info m where m.sample_id = biz_business_order_sample_relation.sample_id" + + " AND m.order_id = biz_business_order_sample_relation.order_id ) as measureRemark"); wrapper.eq("order_id", orderInfo.getId()); List orderSampleList = sampleRelationMapper.selectList(wrapper); - for (BizBusinessOrderSampleRelation bizBusinessOrderSampleRelation : orderSampleList) { - DictCodeUtils.convertDictCodeToName(bizBusinessOrderSampleRelation); + for (BizBusinessOrderSampleRelation relation : orderSampleList) { + if(StrUtil.isNotEmpty(relation.getMeasureCompleteTime())){ + relation.setMeasureCompleteTime(relation.getMeasureCompleteTime().substring(0,10)); + } + if("已检完".equals(relation.getMeasureCompletePercent())){ + relation.setConclusion(getConclusion(relation.getOrderId(), relation.getSampleId())); + } + DictCodeUtils.convertDictCodeToName(relation); } orderInfo.setCustomerSampleInfoList(orderSampleList); return ReturnUtil.success(orderInfo); @@ -179,9 +236,21 @@ } wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()),"measure_company",request.getMeasureCompany()); - wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus()); +// wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus()); wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()),"is_on_site_check",request.getIsOnSiteCheck()); + if(StrUtil.isNotEmpty(request.getOrderStatus())){ + if(OrderStatusEnum.ORDER_STATUS_TO_BACK.equals(request.getOrderStatus())){ + wrapper.eq("receive_status",OrderStatusEnum.RECEIVE_STATUS_COMPLETE); + wrapper.gt("unBackCount",0); + }else if(OrderStatusEnum.ORDER_STATUS_BACKED.equals(request.getOrderStatus())){ + wrapper.eq("receive_status",OrderStatusEnum.RECEIVE_STATUS_COMPLETE); + wrapper.le("unBackCount",0); + }else { + wrapper.eq("receive_status",request.getOrderStatus()); + } + } + if(ObjectUtil.isNotEmpty(request.getUsePositionId())){ String positionSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.use_position_id = %s)",request.getUsePositionId()); wrapper.exists(positionSql); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java index 7117130..f17c2d2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java @@ -161,7 +161,7 @@ wrapper.eq(ObjectUtil.isNotEmpty(request.getDeptId()),"create_dept_id",request.getDeptId()); wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()),"measure_company",request.getMeasureCompany()); - wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus()); +// wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus()); wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()),"is_on_site_check",request.getIsOnSiteCheck()); if(ObjectUtil.isNotEmpty(request.getUsePositionId())){ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java index a3cc46c..d978812 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java @@ -15,21 +15,20 @@ import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.board.EquipmentStatisticsList; import com.casic.missiles.dto.certificate.SubcontractCertificateImportDTO; import com.casic.missiles.dto.equipment.EquipmentCertificateDTO; -import com.casic.missiles.dto.equipment.EquipmentImportDTO; -import com.casic.missiles.dto.system.RfidImportDTO; -import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.plan.SampleStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.listeners.CommonExcelListener; import com.casic.missiles.model.equipment.EquipmentInfo; +import com.casic.missiles.model.plan.SampleStatueUpdate; import com.casic.missiles.model.subcontract.SubcontractCertificate; import com.casic.missiles.mapper.subcontract.SubcontractCertificateMapper; import com.casic.missiles.model.subcontract.Subcontractor; import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.service.equipment.IEquipmentInfoService; +import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.subcontract.ISubcontractCertificateService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.service.subcontract.ISubcontractorService; @@ -37,7 +36,6 @@ import com.casic.missiles.utils.FileUtil; import com.casic.missiles.utils.MinioUtil; import lombok.RequiredArgsConstructor; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -75,6 +73,7 @@ private final AbstractDictService dictService; private IEquipmentInfoService equipmentInfoService; private ISubcontractorService subcontractorService; + private final IPlanEquipmentRelationService planEquipmentRelationService; @Value("${casic.role.operator: user}") private String operatorRoleTip; @@ -196,6 +195,7 @@ throw new BusinessException(1500, String.format(validMsg, i + 1, "检测单位名称与名录不一致")); } importDTO.setSubcontractorId(subcontractor.getId()); + importDTO.setSubcontractorName(subcontractor.getCompanyName()); } else { throw new BusinessException(1500, String.format(validMsg, i + 1, "检测单位不存在")); } @@ -284,6 +284,9 @@ SubcontractCertificate latest = subList.get(subList.size() - 1); equipmentInfoService.updateCertificateInfo(equipmentId, latest.getSubcontractorName(), latest.getCheckDate(), latest.getCertificateValid(), latest.getMeterIdentify(),latest.getLimitInstruction()); } + for (SubcontractCertificate certificate : resultList) { + updatePlanSampleStatus(certificate); + } } @Override @@ -424,8 +427,20 @@ @Override @Transactional public void saveOrUpdateInfo(SubcontractCertificate entity) { + boolean save = ObjectUtil.isEmpty(entity.getId()); this.saveOrUpdate(entity); equipmentInfoService.updateCertificateInfo(entity.getEquipmentId(), entity.getSubcontractorName(), entity.getCheckDate(), entity.getCertificateValid(), entity.getMeterIdentify()); + if(save){ + updatePlanSampleStatus(entity); + } + } + + private void updatePlanSampleStatus(SubcontractCertificate certificate){ + SampleStatueUpdate updateInfo = new SampleStatueUpdate(); + updateInfo.setSampleId(certificate.getEquipmentId()); + updateInfo.setSampleStatus(SampleStatusEnum.GIVE_BACK_COMPLETE.getSampleStatus()); + updateInfo.setFinishTime(new Date()); + planEquipmentRelationService.sampleStatusUpdate(updateInfo); } @Override @@ -437,7 +452,7 @@ @Override public Page listScopePage(Page page, String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName, String equipmentModel,String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo, String equipmentManufacturer, String certificateValidStart, String certificateValidEnd, @@ -445,7 +460,7 @@ DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); dataScope.setScopeName("c.create_dept_id"); QueryWrapper queryWrapper = commonQuery(certificateNo, certificateName, equipmentNo, - equipmentName, subcontractorName, createTimeStart, createTimeEnd, + equipmentName, equipmentModel,subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo, equipmentManufacturer, certificateValidStart, certificateValidEnd, checkDateStart, checkDateEnd); List list = this.baseMapper.listScopePage(dataScope, page, queryWrapper); @@ -458,7 +473,7 @@ @Override public List listScope(String certificateNo, String certificateName, String equipmentNo, - String equipmentName, String subcontractorName, + String equipmentName, String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo, String equipmentManufacturer, String certificateValidStart, String certificateValidEnd, @@ -471,7 +486,7 @@ queryWrapper = new QueryWrapper<>(); queryWrapper.in("c.id", ids); } else { - queryWrapper = commonQuery(certificateNo, certificateName, equipmentNo, equipmentName, subcontractorName, + queryWrapper = commonQuery(certificateNo, certificateName, equipmentNo, equipmentName, equipmentModel, subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo, equipmentManufacturer, certificateValidStart, certificateValidEnd, checkDateStart, checkDateEnd); @@ -502,7 +517,7 @@ } private QueryWrapper commonQuery(String certificateNo, String certificateName, String equipmentNo, - String equipmentName, String subcontractorName, + String equipmentName, String equipmentModel,String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo, String equipmentManufacturer, String certificateValidStart, String certificateValidEnd, @@ -525,6 +540,9 @@ if (StrUtil.isNotEmpty(equipmentName)) { queryWrapper.eq("e.equipment_name", equipmentName); } + if (StrUtil.isNotEmpty(equipmentModel)) { + queryWrapper.eq("e.model", equipmentModel); + } if (StrUtil.isNotEmpty(equipmentManufactureNo)) { queryWrapper.like("e.manufacture_no", equipmentManufactureNo); } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index a31f9c1..470135e 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java new file mode 100644 index 0000000..fda9f0d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java @@ -0,0 +1,13 @@ +package com.casic.missiles.enums.plan; + +import liquibase.pro.packaged.S; + +public interface OrderStatusEnum { + + String RECEIVE_STATUS_COMPLETE = "4"; // 接收状态-检测完成 + + + String ORDER_STATUS_TO_BACK = "6"; // 任务单状态 - 待取回 + + String ORDER_STATUS_BACKED = "7"; // 任务单状态 - 已取回 +} diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index d52996f..993d279 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 359c1f2..36aa2ed 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; import com.casic.missiles.model.business.BizBusinessOrderSampleRelation; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -36,4 +37,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + @Select("select conclusion from biz_business_device_measure_info where order_id = #{orderId} and sample_id = #{sampleId} order by id desc limit 1") + String getConclusion(@Param("orderId")Long orderId,@Param("sampleId")Long sampleId); + + @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") + Integer getUnBackCount(@Param("orderId")Long orderId); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml index e4a103f..5f5886b 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml @@ -42,7 +42,7 @@ select * from ( SELECT * --- ,(select dept_id from sys_user where id = create_user_id) as dept_id + ,(select count(*) from biz_business_order_sample_relation relation where relation.order_id = biz_business_order_info.id and sample_status='5') as unBackCount FROM biz_business_order_info ) t diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 3335fec..1bb8180 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-job - 1.3.2.0 + 1.3.3.0 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 3dcc2aa..4e4fd24 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -52,13 +52,13 @@ @GetMapping("/listPage") @ResponseBody public ReturnDTO> listPage(String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo, String equipmentManufacturer, String certificateValidStart,String certificateValidEnd, String checkDateStart, String checkDateEnd) { Page page = PageFactory.defaultPage(); - page = certificateService.listScopePage(page, certificateNo, certificateName, equipmentNo, equipmentName, + page = certificateService.listScopePage(page, certificateNo, certificateName, equipmentNo, equipmentName,equipmentModel, subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo,equipmentManufacturer, certificateValidStart,certificateValidEnd,checkDateStart,checkDateEnd); @@ -69,14 +69,14 @@ @PostMapping("/export") @ResponseBody public void export(String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo,String equipmentManufacturer, String certificateValidStart,String certificateValidEnd, String checkDateStart, String checkDateEnd, @RequestParam("ids") List ids) throws IOException { List list = certificateService.listScope(certificateNo, certificateName, equipmentNo, - equipmentName, subcontractorName, createTimeStart, createTimeEnd, + equipmentName, equipmentModel,subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo,equipmentManufacturer, certificateValidStart,certificateValidEnd,checkDateStart,checkDateEnd, ids); diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 0411c27..bae3416 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.2.0 + 1.3.3.0 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index a18b82c..731b0bc 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 8296d60..64b9c20 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -46,6 +46,8 @@ String PLAN_EXECUTE_STATUS = DICT_PREFIX + "PlanExecuteStatus"; // 计量计划检定完成度 String PLAN_CHECK_COMPLETION = DICT_PREFIX + "PlanCheckCompletion"; + + String EQPT_ORDER_STATUS = DICT_PREFIX + "TaskStatus"; // 文档变更类型 String FILE_LOG_TYPE = DICT_PREFIX + "FileLogType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java index 7de9c2d..c300fc1 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java @@ -39,8 +39,11 @@ @ApiModelProperty(value = "出厂编号") private String manufactureNo; - @ApiModelProperty(value = "接收状态（包括接收相关状态和检测完成状态）", dataType = "String") - private String receiveStatus; +// @ApiModelProperty(value = "接收状态（包括接收相关状态和检测完成状态）", dataType = "String") +// private String receiveStatus; + + @ApiModelProperty(value = "任务单状态", dataType = "String") + private String orderStatus; @ApiModelProperty(value = "是否现场检定") private Integer isOnSiteCheck; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java index f17b7a7..3e92a46 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java @@ -57,13 +57,30 @@ @ApiModelProperty(value = "接收状态名称", dataType = "String") private String receiveStatusName; + @ApiModelProperty(value = "任务单状态", dataType = "String") + @DictCodeField(message = "任务单状态不合法", cacheName = MeterDictCode.EQPT_ORDER_STATUS) + @TableField(exist = false) + private String orderStatus; + + @TableField(exist = false) + @ApiModelProperty(value = "任务单状态名称", dataType = "String") + private String orderStatusName; + + @TableField(exist = false) + @ApiModelProperty(hidden = true) + private Integer unBackCount; + + @ApiModelProperty(value = "创建人名字", dataType = "String") private String createUserName; @ApiModelProperty(value = "创建时间", dataType = "String") private String createTime; - @ApiModelProperty(value = "计划送检时间", dataType = "String") + @ApiModelProperty(value = "要求检完时间", dataType = "String") private String requireOverTime; + @ApiModelProperty(value = "预计送达时间", dataType = "String") + private String planDeliverTime; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java index 5773c4e..be0e35a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java @@ -40,6 +40,14 @@ @ApiModelProperty("使用状态名称") private String usageStatusName; + + @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_CHECK_DESTINATION,needValid = true,message = "检定去向不合法") + @ApiModelProperty(value = "检定去向",notes = "检定去向") + private String checkDestination; + + @ApiModelProperty("检定去向名称") + private String checkDestinationName; + @ApiModelProperty("计量标识") @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_METER_IDENTITY) private String meterIdentify; @@ -57,4 +65,7 @@ @ApiModelProperty("检定状态名称") private String checkStatusName; + + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java index 74e2d2a..ed74deb 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java @@ -167,6 +167,16 @@ @ApiModelProperty(value = "接收状态名称", dataType = "String") private String receiveStatusName; + + @ApiModelProperty(value = "任务单状态", dataType = "String") + @DictCodeField(message = "任务单状态不合法", cacheName = MeterDictCode.EQPT_ORDER_STATUS) + @TableField(exist = false) + private String orderStatus; + + @TableField(exist = false) + @ApiModelProperty(value = "任务单状态名称", dataType = "String") + private String orderStatusName; + /** * 接收说明 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java index 381fa37..badaaab 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java @@ -81,13 +81,13 @@ @TableField(exist = false) - @ApiModelProperty("接收状态名称") + @ApiModelProperty("样品状态名称") private String sampleStatusName; /** * 样品在本次委托中的备注 */ - @ApiModelProperty(value = "样品在本次委托中的备注", dataType = "String") + @ApiModelProperty(value = "样品在本次委托中的备注（退回/补送原因，接收状态说明）", dataType = "String") @TableField("remark") private String remark; @@ -140,7 +140,23 @@ @TableField("measure_content") private String measureContent; - @ApiModelProperty(value = "检定完成度", dataType = "String") + @ApiModelProperty(value = "接收状态") + @TableField(exist = false) + private String receiveStatusName; + + public String getReceiveStatusName() { + if("1".equals(sampleStatus)){ + return "未接收"; + }else if("9".equals(sampleStatus)){ + return "待补送"; + }else if("10".equals(sampleStatus)){ + return "已退回"; + }else { + return "已接收"; + } + } + + @ApiModelProperty(value = "检定完成度(检定结果)", dataType = "String") @TableField(exist = false) private String measureCompletePercent; @@ -150,7 +166,7 @@ } else if("3".equals(sampleStatus) || "4".equals(sampleStatus) || "8".equals(sampleStatus)){ return "检定中"; } else if("5".equals(sampleStatus) || "6".equals(sampleStatus)){ - return "检定完"; + return "已检完"; } else if("10".equals(sampleStatus)){ return "已退回"; } @@ -161,6 +177,14 @@ @TableField("measure_complete_time") private String measureCompleteTime; + @ApiModelProperty("检定结果附加（合格/不合格/退回）") + @TableField(exist = false) + private String conclusion; + + @ApiModelProperty("检定说明") + @TableField(exist = false) + private String measureRemark; + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index cbe6893..edcb882 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-common - 1.3.2.0 + 1.3.3.0 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java index 569773a..1cc3e68 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.business.MeasureTypeEnum; import com.casic.missiles.enums.business.OrderStatusDictEnum; +import com.casic.missiles.enums.plan.CheckCompletionEnum; +import com.casic.missiles.enums.plan.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessOrderInfoMapper; import com.casic.missiles.mapper.business.BizBusinessOrderSampleRelationMapper; @@ -71,24 +73,79 @@ List list = orderListResponseMapper.listPage(page, wrapper); page.setRecords(list); for (OrderListResponse customerAdviceInfo : page.getRecords()) { - DictCodeUtils.convertDictCodeToName(customerAdviceInfo); + customerAdviceInfo.setDeptName(systemDeptService.getParentsDeptName(customerAdviceInfo.getDeptId())); + + if(StrUtil.isNotEmpty(customerAdviceInfo.getReceiveStatus())){ + customerAdviceInfo.setOrderStatus(customerAdviceInfo.getReceiveStatus()); + if(OrderStatusEnum.RECEIVE_STATUS_COMPLETE.equals(customerAdviceInfo.getReceiveStatus())){ + if(customerAdviceInfo.getUnBackCount() > 0){ + customerAdviceInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_TO_BACK); + }else { + customerAdviceInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_BACKED); + } + } + } + + if(StrUtil.isNotEmpty(customerAdviceInfo.getRequireOverTime())){ + customerAdviceInfo.setRequireOverTime(customerAdviceInfo.getRequireOverTime().substring(0,10)); + } + if(StrUtil.isNotEmpty(customerAdviceInfo.getPlanDeliverTime())){ + customerAdviceInfo.setPlanDeliverTime(customerAdviceInfo.getPlanDeliverTime().substring(0,10)); + } + + DictCodeUtils.convertDictCodeToName(customerAdviceInfo); } return page; } + private String getConclusion(Long orderId,Long sampleId){ + String conclusion = sampleRelationMapper.getConclusion(orderId,sampleId); + if(StrUtil.isNotBlank(conclusion)){ + if(conclusion.contains("不合格")){ + return "不合格"; + }else if(conclusion.contains("其余所检项目合格")){ + return "限用"; + }else { + return "合格"; + } + } + return conclusion; + } + @Override public ReturnDTO orderDetail(Long id) throws Exception { // todo 交接单编号及pdf打印 BizBusinessOrderInfo orderInfo = this.baseMapper.selectById(id); + + if(StrUtil.isNotEmpty(orderInfo.getReceiveStatus())){ + orderInfo.setOrderStatus(orderInfo.getReceiveStatus()); + if(OrderStatusEnum.RECEIVE_STATUS_COMPLETE.equals(orderInfo.getReceiveStatus())){ + Integer unBackCount = sampleRelationMapper.getUnBackCount(id); + if(unBackCount > 0){ + orderInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_TO_BACK); + }else { + orderInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_BACKED); + } + } + } + DictCodeUtils.convertDictCodeToName(orderInfo); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.select("*","(select manufacturer from eqpt_equipment_info e where e.id = sample_id) as sampleManufacturer" - ,"(select manufacture_no from eqpt_equipment_info e where e.id = sample_id) as sampleManufactureNo"); + ,"(select manufacture_no from eqpt_equipment_info e where e.id = sample_id) as sampleManufactureNo" + ,"(select GROUP_CONCAT(remark) from biz_business_device_measure_info m where m.sample_id = biz_business_order_sample_relation.sample_id" + + " AND m.order_id = biz_business_order_sample_relation.order_id ) as measureRemark"); wrapper.eq("order_id", orderInfo.getId()); List orderSampleList = sampleRelationMapper.selectList(wrapper); - for (BizBusinessOrderSampleRelation bizBusinessOrderSampleRelation : orderSampleList) { - DictCodeUtils.convertDictCodeToName(bizBusinessOrderSampleRelation); + for (BizBusinessOrderSampleRelation relation : orderSampleList) { + if(StrUtil.isNotEmpty(relation.getMeasureCompleteTime())){ + relation.setMeasureCompleteTime(relation.getMeasureCompleteTime().substring(0,10)); + } + if("已检完".equals(relation.getMeasureCompletePercent())){ + relation.setConclusion(getConclusion(relation.getOrderId(), relation.getSampleId())); + } + DictCodeUtils.convertDictCodeToName(relation); } orderInfo.setCustomerSampleInfoList(orderSampleList); return ReturnUtil.success(orderInfo); @@ -179,9 +236,21 @@ } wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()),"measure_company",request.getMeasureCompany()); - wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus()); +// wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus()); wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()),"is_on_site_check",request.getIsOnSiteCheck()); + if(StrUtil.isNotEmpty(request.getOrderStatus())){ + if(OrderStatusEnum.ORDER_STATUS_TO_BACK.equals(request.getOrderStatus())){ + wrapper.eq("receive_status",OrderStatusEnum.RECEIVE_STATUS_COMPLETE); + wrapper.gt("unBackCount",0); + }else if(OrderStatusEnum.ORDER_STATUS_BACKED.equals(request.getOrderStatus())){ + wrapper.eq("receive_status",OrderStatusEnum.RECEIVE_STATUS_COMPLETE); + wrapper.le("unBackCount",0); + }else { + wrapper.eq("receive_status",request.getOrderStatus()); + } + } + if(ObjectUtil.isNotEmpty(request.getUsePositionId())){ String positionSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.use_position_id = %s)",request.getUsePositionId()); wrapper.exists(positionSql); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java index 7117130..f17c2d2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java @@ -161,7 +161,7 @@ wrapper.eq(ObjectUtil.isNotEmpty(request.getDeptId()),"create_dept_id",request.getDeptId()); wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()),"measure_company",request.getMeasureCompany()); - wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus()); +// wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus()); wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()),"is_on_site_check",request.getIsOnSiteCheck()); if(ObjectUtil.isNotEmpty(request.getUsePositionId())){ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java index a3cc46c..d978812 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java @@ -15,21 +15,20 @@ import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.board.EquipmentStatisticsList; import com.casic.missiles.dto.certificate.SubcontractCertificateImportDTO; import com.casic.missiles.dto.equipment.EquipmentCertificateDTO; -import com.casic.missiles.dto.equipment.EquipmentImportDTO; -import com.casic.missiles.dto.system.RfidImportDTO; -import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.plan.SampleStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.listeners.CommonExcelListener; import com.casic.missiles.model.equipment.EquipmentInfo; +import com.casic.missiles.model.plan.SampleStatueUpdate; import com.casic.missiles.model.subcontract.SubcontractCertificate; import com.casic.missiles.mapper.subcontract.SubcontractCertificateMapper; import com.casic.missiles.model.subcontract.Subcontractor; import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.service.equipment.IEquipmentInfoService; +import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.subcontract.ISubcontractCertificateService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.service.subcontract.ISubcontractorService; @@ -37,7 +36,6 @@ import com.casic.missiles.utils.FileUtil; import com.casic.missiles.utils.MinioUtil; import lombok.RequiredArgsConstructor; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -75,6 +73,7 @@ private final AbstractDictService dictService; private IEquipmentInfoService equipmentInfoService; private ISubcontractorService subcontractorService; + private final IPlanEquipmentRelationService planEquipmentRelationService; @Value("${casic.role.operator: user}") private String operatorRoleTip; @@ -196,6 +195,7 @@ throw new BusinessException(1500, String.format(validMsg, i + 1, "检测单位名称与名录不一致")); } importDTO.setSubcontractorId(subcontractor.getId()); + importDTO.setSubcontractorName(subcontractor.getCompanyName()); } else { throw new BusinessException(1500, String.format(validMsg, i + 1, "检测单位不存在")); } @@ -284,6 +284,9 @@ SubcontractCertificate latest = subList.get(subList.size() - 1); equipmentInfoService.updateCertificateInfo(equipmentId, latest.getSubcontractorName(), latest.getCheckDate(), latest.getCertificateValid(), latest.getMeterIdentify(),latest.getLimitInstruction()); } + for (SubcontractCertificate certificate : resultList) { + updatePlanSampleStatus(certificate); + } } @Override @@ -424,8 +427,20 @@ @Override @Transactional public void saveOrUpdateInfo(SubcontractCertificate entity) { + boolean save = ObjectUtil.isEmpty(entity.getId()); this.saveOrUpdate(entity); equipmentInfoService.updateCertificateInfo(entity.getEquipmentId(), entity.getSubcontractorName(), entity.getCheckDate(), entity.getCertificateValid(), entity.getMeterIdentify()); + if(save){ + updatePlanSampleStatus(entity); + } + } + + private void updatePlanSampleStatus(SubcontractCertificate certificate){ + SampleStatueUpdate updateInfo = new SampleStatueUpdate(); + updateInfo.setSampleId(certificate.getEquipmentId()); + updateInfo.setSampleStatus(SampleStatusEnum.GIVE_BACK_COMPLETE.getSampleStatus()); + updateInfo.setFinishTime(new Date()); + planEquipmentRelationService.sampleStatusUpdate(updateInfo); } @Override @@ -437,7 +452,7 @@ @Override public Page listScopePage(Page page, String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName, String equipmentModel,String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo, String equipmentManufacturer, String certificateValidStart, String certificateValidEnd, @@ -445,7 +460,7 @@ DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); dataScope.setScopeName("c.create_dept_id"); QueryWrapper queryWrapper = commonQuery(certificateNo, certificateName, equipmentNo, - equipmentName, subcontractorName, createTimeStart, createTimeEnd, + equipmentName, equipmentModel,subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo, equipmentManufacturer, certificateValidStart, certificateValidEnd, checkDateStart, checkDateEnd); List list = this.baseMapper.listScopePage(dataScope, page, queryWrapper); @@ -458,7 +473,7 @@ @Override public List listScope(String certificateNo, String certificateName, String equipmentNo, - String equipmentName, String subcontractorName, + String equipmentName, String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo, String equipmentManufacturer, String certificateValidStart, String certificateValidEnd, @@ -471,7 +486,7 @@ queryWrapper = new QueryWrapper<>(); queryWrapper.in("c.id", ids); } else { - queryWrapper = commonQuery(certificateNo, certificateName, equipmentNo, equipmentName, subcontractorName, + queryWrapper = commonQuery(certificateNo, certificateName, equipmentNo, equipmentName, equipmentModel, subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo, equipmentManufacturer, certificateValidStart, certificateValidEnd, checkDateStart, checkDateEnd); @@ -502,7 +517,7 @@ } private QueryWrapper commonQuery(String certificateNo, String certificateName, String equipmentNo, - String equipmentName, String subcontractorName, + String equipmentName, String equipmentModel,String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo, String equipmentManufacturer, String certificateValidStart, String certificateValidEnd, @@ -525,6 +540,9 @@ if (StrUtil.isNotEmpty(equipmentName)) { queryWrapper.eq("e.equipment_name", equipmentName); } + if (StrUtil.isNotEmpty(equipmentModel)) { + queryWrapper.eq("e.model", equipmentModel); + } if (StrUtil.isNotEmpty(equipmentManufactureNo)) { queryWrapper.like("e.manufacture_no", equipmentManufactureNo); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java index 67be945..362252d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java @@ -18,6 +18,7 @@ import com.casic.missiles.model.subcontract.Subcontractor; import com.casic.missiles.service.impl.CommonApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.subcontract.ISubcontractOrderRelationService; import com.casic.missiles.service.subcontract.ISubcontractOrderService; import com.casic.missiles.service.subcontract.ISubcontractorService; @@ -54,6 +55,8 @@ @Autowired private ISubcontractorService subcontractorService; @Autowired + private IPlanEquipmentRelationService planEquipmentRelationService; + @Autowired private ISystemDeptService systemDeptService; @Autowired private PrintFileRegister printFileRegister; @@ -183,10 +186,12 @@ SampleStatueUpdate updateInfo = new SampleStatueUpdate(); updateInfo.setOrderId(approvalId); updateInfo.setSampleId(relation.getEquipmentId()); - updateInfo.setSampleStatus(SampleStatusEnum.GIVE_BACK_COMPLETE.getSampleStatus()); - updateInfo.setFinishTime(new Date()); + updateInfo.setSampleStatus(SampleStatusEnum.IN_MEASURE.getSampleStatus()); +// updateInfo.setFinishTime(new Date()); updateInfo.setRealDeliverTime(new Date()); updateInfo.setMeasureCompany(subcontractor.getCompanyName()); + planEquipmentRelationService.sampleStatusUpdate(updateInfo); + } } diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index a31f9c1..470135e 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java new file mode 100644 index 0000000..fda9f0d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java @@ -0,0 +1,13 @@ +package com.casic.missiles.enums.plan; + +import liquibase.pro.packaged.S; + +public interface OrderStatusEnum { + + String RECEIVE_STATUS_COMPLETE = "4"; // 接收状态-检测完成 + + + String ORDER_STATUS_TO_BACK = "6"; // 任务单状态 - 待取回 + + String ORDER_STATUS_BACKED = "7"; // 任务单状态 - 已取回 +} diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index d52996f..993d279 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 359c1f2..36aa2ed 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; import com.casic.missiles.model.business.BizBusinessOrderSampleRelation; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -36,4 +37,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + @Select("select conclusion from biz_business_device_measure_info where order_id = #{orderId} and sample_id = #{sampleId} order by id desc limit 1") + String getConclusion(@Param("orderId")Long orderId,@Param("sampleId")Long sampleId); + + @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") + Integer getUnBackCount(@Param("orderId")Long orderId); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml index e4a103f..5f5886b 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml @@ -42,7 +42,7 @@ select * from ( SELECT * --- ,(select dept_id from sys_user where id = create_user_id) as dept_id + ,(select count(*) from biz_business_order_sample_relation relation where relation.order_id = biz_business_order_info.id and sample_status='5') as unBackCount FROM biz_business_order_info ) t diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 3335fec..1bb8180 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-job - 1.3.2.0 + 1.3.3.0 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 3dcc2aa..4e4fd24 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -52,13 +52,13 @@ @GetMapping("/listPage") @ResponseBody public ReturnDTO> listPage(String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo, String equipmentManufacturer, String certificateValidStart,String certificateValidEnd, String checkDateStart, String checkDateEnd) { Page page = PageFactory.defaultPage(); - page = certificateService.listScopePage(page, certificateNo, certificateName, equipmentNo, equipmentName, + page = certificateService.listScopePage(page, certificateNo, certificateName, equipmentNo, equipmentName,equipmentModel, subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo,equipmentManufacturer, certificateValidStart,certificateValidEnd,checkDateStart,checkDateEnd); @@ -69,14 +69,14 @@ @PostMapping("/export") @ResponseBody public void export(String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo,String equipmentManufacturer, String certificateValidStart,String certificateValidEnd, String checkDateStart, String checkDateEnd, @RequestParam("ids") List ids) throws IOException { List list = certificateService.listScope(certificateNo, certificateName, equipmentNo, - equipmentName, subcontractorName, createTimeStart, createTimeEnd, + equipmentName, equipmentModel,subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo,equipmentManufacturer, certificateValidStart,certificateValidEnd,checkDateStart,checkDateEnd, ids); diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 0411c27..bae3416 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.2.0 + 1.3.3.0 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index a18b82c..731b0bc 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 8296d60..64b9c20 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -46,6 +46,8 @@ String PLAN_EXECUTE_STATUS = DICT_PREFIX + "PlanExecuteStatus"; // 计量计划检定完成度 String PLAN_CHECK_COMPLETION = DICT_PREFIX + "PlanCheckCompletion"; + + String EQPT_ORDER_STATUS = DICT_PREFIX + "TaskStatus"; // 文档变更类型 String FILE_LOG_TYPE = DICT_PREFIX + "FileLogType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java index 7de9c2d..c300fc1 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java @@ -39,8 +39,11 @@ @ApiModelProperty(value = "出厂编号") private String manufactureNo; - @ApiModelProperty(value = "接收状态（包括接收相关状态和检测完成状态）", dataType = "String") - private String receiveStatus; +// @ApiModelProperty(value = "接收状态（包括接收相关状态和检测完成状态）", dataType = "String") +// private String receiveStatus; + + @ApiModelProperty(value = "任务单状态", dataType = "String") + private String orderStatus; @ApiModelProperty(value = "是否现场检定") private Integer isOnSiteCheck; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java index f17b7a7..3e92a46 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java @@ -57,13 +57,30 @@ @ApiModelProperty(value = "接收状态名称", dataType = "String") private String receiveStatusName; + @ApiModelProperty(value = "任务单状态", dataType = "String") + @DictCodeField(message = "任务单状态不合法", cacheName = MeterDictCode.EQPT_ORDER_STATUS) + @TableField(exist = false) + private String orderStatus; + + @TableField(exist = false) + @ApiModelProperty(value = "任务单状态名称", dataType = "String") + private String orderStatusName; + + @TableField(exist = false) + @ApiModelProperty(hidden = true) + private Integer unBackCount; + + @ApiModelProperty(value = "创建人名字", dataType = "String") private String createUserName; @ApiModelProperty(value = "创建时间", dataType = "String") private String createTime; - @ApiModelProperty(value = "计划送检时间", dataType = "String") + @ApiModelProperty(value = "要求检完时间", dataType = "String") private String requireOverTime; + @ApiModelProperty(value = "预计送达时间", dataType = "String") + private String planDeliverTime; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java index 5773c4e..be0e35a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java @@ -40,6 +40,14 @@ @ApiModelProperty("使用状态名称") private String usageStatusName; + + @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_CHECK_DESTINATION,needValid = true,message = "检定去向不合法") + @ApiModelProperty(value = "检定去向",notes = "检定去向") + private String checkDestination; + + @ApiModelProperty("检定去向名称") + private String checkDestinationName; + @ApiModelProperty("计量标识") @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_METER_IDENTITY) private String meterIdentify; @@ -57,4 +65,7 @@ @ApiModelProperty("检定状态名称") private String checkStatusName; + + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java index 74e2d2a..ed74deb 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java @@ -167,6 +167,16 @@ @ApiModelProperty(value = "接收状态名称", dataType = "String") private String receiveStatusName; + + @ApiModelProperty(value = "任务单状态", dataType = "String") + @DictCodeField(message = "任务单状态不合法", cacheName = MeterDictCode.EQPT_ORDER_STATUS) + @TableField(exist = false) + private String orderStatus; + + @TableField(exist = false) + @ApiModelProperty(value = "任务单状态名称", dataType = "String") + private String orderStatusName; + /** * 接收说明 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java index 381fa37..badaaab 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java @@ -81,13 +81,13 @@ @TableField(exist = false) - @ApiModelProperty("接收状态名称") + @ApiModelProperty("样品状态名称") private String sampleStatusName; /** * 样品在本次委托中的备注 */ - @ApiModelProperty(value = "样品在本次委托中的备注", dataType = "String") + @ApiModelProperty(value = "样品在本次委托中的备注（退回/补送原因，接收状态说明）", dataType = "String") @TableField("remark") private String remark; @@ -140,7 +140,23 @@ @TableField("measure_content") private String measureContent; - @ApiModelProperty(value = "检定完成度", dataType = "String") + @ApiModelProperty(value = "接收状态") + @TableField(exist = false) + private String receiveStatusName; + + public String getReceiveStatusName() { + if("1".equals(sampleStatus)){ + return "未接收"; + }else if("9".equals(sampleStatus)){ + return "待补送"; + }else if("10".equals(sampleStatus)){ + return "已退回"; + }else { + return "已接收"; + } + } + + @ApiModelProperty(value = "检定完成度(检定结果)", dataType = "String") @TableField(exist = false) private String measureCompletePercent; @@ -150,7 +166,7 @@ } else if("3".equals(sampleStatus) || "4".equals(sampleStatus) || "8".equals(sampleStatus)){ return "检定中"; } else if("5".equals(sampleStatus) || "6".equals(sampleStatus)){ - return "检定完"; + return "已检完"; } else if("10".equals(sampleStatus)){ return "已退回"; } @@ -161,6 +177,14 @@ @TableField("measure_complete_time") private String measureCompleteTime; + @ApiModelProperty("检定结果附加（合格/不合格/退回）") + @TableField(exist = false) + private String conclusion; + + @ApiModelProperty("检定说明") + @TableField(exist = false) + private String measureRemark; + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index cbe6893..edcb882 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-common - 1.3.2.0 + 1.3.3.0 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java index 569773a..1cc3e68 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.business.MeasureTypeEnum; import com.casic.missiles.enums.business.OrderStatusDictEnum; +import com.casic.missiles.enums.plan.CheckCompletionEnum; +import com.casic.missiles.enums.plan.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessOrderInfoMapper; import com.casic.missiles.mapper.business.BizBusinessOrderSampleRelationMapper; @@ -71,24 +73,79 @@ List list = orderListResponseMapper.listPage(page, wrapper); page.setRecords(list); for (OrderListResponse customerAdviceInfo : page.getRecords()) { - DictCodeUtils.convertDictCodeToName(customerAdviceInfo); + customerAdviceInfo.setDeptName(systemDeptService.getParentsDeptName(customerAdviceInfo.getDeptId())); + + if(StrUtil.isNotEmpty(customerAdviceInfo.getReceiveStatus())){ + customerAdviceInfo.setOrderStatus(customerAdviceInfo.getReceiveStatus()); + if(OrderStatusEnum.RECEIVE_STATUS_COMPLETE.equals(customerAdviceInfo.getReceiveStatus())){ + if(customerAdviceInfo.getUnBackCount() > 0){ + customerAdviceInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_TO_BACK); + }else { + customerAdviceInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_BACKED); + } + } + } + + if(StrUtil.isNotEmpty(customerAdviceInfo.getRequireOverTime())){ + customerAdviceInfo.setRequireOverTime(customerAdviceInfo.getRequireOverTime().substring(0,10)); + } + if(StrUtil.isNotEmpty(customerAdviceInfo.getPlanDeliverTime())){ + customerAdviceInfo.setPlanDeliverTime(customerAdviceInfo.getPlanDeliverTime().substring(0,10)); + } + + DictCodeUtils.convertDictCodeToName(customerAdviceInfo); } return page; } + private String getConclusion(Long orderId,Long sampleId){ + String conclusion = sampleRelationMapper.getConclusion(orderId,sampleId); + if(StrUtil.isNotBlank(conclusion)){ + if(conclusion.contains("不合格")){ + return "不合格"; + }else if(conclusion.contains("其余所检项目合格")){ + return "限用"; + }else { + return "合格"; + } + } + return conclusion; + } + @Override public ReturnDTO orderDetail(Long id) throws Exception { // todo 交接单编号及pdf打印 BizBusinessOrderInfo orderInfo = this.baseMapper.selectById(id); + + if(StrUtil.isNotEmpty(orderInfo.getReceiveStatus())){ + orderInfo.setOrderStatus(orderInfo.getReceiveStatus()); + if(OrderStatusEnum.RECEIVE_STATUS_COMPLETE.equals(orderInfo.getReceiveStatus())){ + Integer unBackCount = sampleRelationMapper.getUnBackCount(id); + if(unBackCount > 0){ + orderInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_TO_BACK); + }else { + orderInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_BACKED); + } + } + } + DictCodeUtils.convertDictCodeToName(orderInfo); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.select("*","(select manufacturer from eqpt_equipment_info e where e.id = sample_id) as sampleManufacturer" - ,"(select manufacture_no from eqpt_equipment_info e where e.id = sample_id) as sampleManufactureNo"); + ,"(select manufacture_no from eqpt_equipment_info e where e.id = sample_id) as sampleManufactureNo" + ,"(select GROUP_CONCAT(remark) from biz_business_device_measure_info m where m.sample_id = biz_business_order_sample_relation.sample_id" + + " AND m.order_id = biz_business_order_sample_relation.order_id ) as measureRemark"); wrapper.eq("order_id", orderInfo.getId()); List orderSampleList = sampleRelationMapper.selectList(wrapper); - for (BizBusinessOrderSampleRelation bizBusinessOrderSampleRelation : orderSampleList) { - DictCodeUtils.convertDictCodeToName(bizBusinessOrderSampleRelation); + for (BizBusinessOrderSampleRelation relation : orderSampleList) { + if(StrUtil.isNotEmpty(relation.getMeasureCompleteTime())){ + relation.setMeasureCompleteTime(relation.getMeasureCompleteTime().substring(0,10)); + } + if("已检完".equals(relation.getMeasureCompletePercent())){ + relation.setConclusion(getConclusion(relation.getOrderId(), relation.getSampleId())); + } + DictCodeUtils.convertDictCodeToName(relation); } orderInfo.setCustomerSampleInfoList(orderSampleList); return ReturnUtil.success(orderInfo); @@ -179,9 +236,21 @@ } wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()),"measure_company",request.getMeasureCompany()); - wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus()); +// wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus()); wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()),"is_on_site_check",request.getIsOnSiteCheck()); + if(StrUtil.isNotEmpty(request.getOrderStatus())){ + if(OrderStatusEnum.ORDER_STATUS_TO_BACK.equals(request.getOrderStatus())){ + wrapper.eq("receive_status",OrderStatusEnum.RECEIVE_STATUS_COMPLETE); + wrapper.gt("unBackCount",0); + }else if(OrderStatusEnum.ORDER_STATUS_BACKED.equals(request.getOrderStatus())){ + wrapper.eq("receive_status",OrderStatusEnum.RECEIVE_STATUS_COMPLETE); + wrapper.le("unBackCount",0); + }else { + wrapper.eq("receive_status",request.getOrderStatus()); + } + } + if(ObjectUtil.isNotEmpty(request.getUsePositionId())){ String positionSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.use_position_id = %s)",request.getUsePositionId()); wrapper.exists(positionSql); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java index 7117130..f17c2d2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java @@ -161,7 +161,7 @@ wrapper.eq(ObjectUtil.isNotEmpty(request.getDeptId()),"create_dept_id",request.getDeptId()); wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()),"measure_company",request.getMeasureCompany()); - wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus()); +// wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus()); wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()),"is_on_site_check",request.getIsOnSiteCheck()); if(ObjectUtil.isNotEmpty(request.getUsePositionId())){ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java index a3cc46c..d978812 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java @@ -15,21 +15,20 @@ import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.board.EquipmentStatisticsList; import com.casic.missiles.dto.certificate.SubcontractCertificateImportDTO; import com.casic.missiles.dto.equipment.EquipmentCertificateDTO; -import com.casic.missiles.dto.equipment.EquipmentImportDTO; -import com.casic.missiles.dto.system.RfidImportDTO; -import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.plan.SampleStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.listeners.CommonExcelListener; import com.casic.missiles.model.equipment.EquipmentInfo; +import com.casic.missiles.model.plan.SampleStatueUpdate; import com.casic.missiles.model.subcontract.SubcontractCertificate; import com.casic.missiles.mapper.subcontract.SubcontractCertificateMapper; import com.casic.missiles.model.subcontract.Subcontractor; import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.service.equipment.IEquipmentInfoService; +import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.subcontract.ISubcontractCertificateService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.service.subcontract.ISubcontractorService; @@ -37,7 +36,6 @@ import com.casic.missiles.utils.FileUtil; import com.casic.missiles.utils.MinioUtil; import lombok.RequiredArgsConstructor; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -75,6 +73,7 @@ private final AbstractDictService dictService; private IEquipmentInfoService equipmentInfoService; private ISubcontractorService subcontractorService; + private final IPlanEquipmentRelationService planEquipmentRelationService; @Value("${casic.role.operator: user}") private String operatorRoleTip; @@ -196,6 +195,7 @@ throw new BusinessException(1500, String.format(validMsg, i + 1, "检测单位名称与名录不一致")); } importDTO.setSubcontractorId(subcontractor.getId()); + importDTO.setSubcontractorName(subcontractor.getCompanyName()); } else { throw new BusinessException(1500, String.format(validMsg, i + 1, "检测单位不存在")); } @@ -284,6 +284,9 @@ SubcontractCertificate latest = subList.get(subList.size() - 1); equipmentInfoService.updateCertificateInfo(equipmentId, latest.getSubcontractorName(), latest.getCheckDate(), latest.getCertificateValid(), latest.getMeterIdentify(),latest.getLimitInstruction()); } + for (SubcontractCertificate certificate : resultList) { + updatePlanSampleStatus(certificate); + } } @Override @@ -424,8 +427,20 @@ @Override @Transactional public void saveOrUpdateInfo(SubcontractCertificate entity) { + boolean save = ObjectUtil.isEmpty(entity.getId()); this.saveOrUpdate(entity); equipmentInfoService.updateCertificateInfo(entity.getEquipmentId(), entity.getSubcontractorName(), entity.getCheckDate(), entity.getCertificateValid(), entity.getMeterIdentify()); + if(save){ + updatePlanSampleStatus(entity); + } + } + + private void updatePlanSampleStatus(SubcontractCertificate certificate){ + SampleStatueUpdate updateInfo = new SampleStatueUpdate(); + updateInfo.setSampleId(certificate.getEquipmentId()); + updateInfo.setSampleStatus(SampleStatusEnum.GIVE_BACK_COMPLETE.getSampleStatus()); + updateInfo.setFinishTime(new Date()); + planEquipmentRelationService.sampleStatusUpdate(updateInfo); } @Override @@ -437,7 +452,7 @@ @Override public Page listScopePage(Page page, String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName, String equipmentModel,String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo, String equipmentManufacturer, String certificateValidStart, String certificateValidEnd, @@ -445,7 +460,7 @@ DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); dataScope.setScopeName("c.create_dept_id"); QueryWrapper queryWrapper = commonQuery(certificateNo, certificateName, equipmentNo, - equipmentName, subcontractorName, createTimeStart, createTimeEnd, + equipmentName, equipmentModel,subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo, equipmentManufacturer, certificateValidStart, certificateValidEnd, checkDateStart, checkDateEnd); List list = this.baseMapper.listScopePage(dataScope, page, queryWrapper); @@ -458,7 +473,7 @@ @Override public List listScope(String certificateNo, String certificateName, String equipmentNo, - String equipmentName, String subcontractorName, + String equipmentName, String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo, String equipmentManufacturer, String certificateValidStart, String certificateValidEnd, @@ -471,7 +486,7 @@ queryWrapper = new QueryWrapper<>(); queryWrapper.in("c.id", ids); } else { - queryWrapper = commonQuery(certificateNo, certificateName, equipmentNo, equipmentName, subcontractorName, + queryWrapper = commonQuery(certificateNo, certificateName, equipmentNo, equipmentName, equipmentModel, subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo, equipmentManufacturer, certificateValidStart, certificateValidEnd, checkDateStart, checkDateEnd); @@ -502,7 +517,7 @@ } private QueryWrapper commonQuery(String certificateNo, String certificateName, String equipmentNo, - String equipmentName, String subcontractorName, + String equipmentName, String equipmentModel,String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo, String equipmentManufacturer, String certificateValidStart, String certificateValidEnd, @@ -525,6 +540,9 @@ if (StrUtil.isNotEmpty(equipmentName)) { queryWrapper.eq("e.equipment_name", equipmentName); } + if (StrUtil.isNotEmpty(equipmentModel)) { + queryWrapper.eq("e.model", equipmentModel); + } if (StrUtil.isNotEmpty(equipmentManufactureNo)) { queryWrapper.like("e.manufacture_no", equipmentManufactureNo); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java index 67be945..362252d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java @@ -18,6 +18,7 @@ import com.casic.missiles.model.subcontract.Subcontractor; import com.casic.missiles.service.impl.CommonApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.subcontract.ISubcontractOrderRelationService; import com.casic.missiles.service.subcontract.ISubcontractOrderService; import com.casic.missiles.service.subcontract.ISubcontractorService; @@ -54,6 +55,8 @@ @Autowired private ISubcontractorService subcontractorService; @Autowired + private IPlanEquipmentRelationService planEquipmentRelationService; + @Autowired private ISystemDeptService systemDeptService; @Autowired private PrintFileRegister printFileRegister; @@ -183,10 +186,12 @@ SampleStatueUpdate updateInfo = new SampleStatueUpdate(); updateInfo.setOrderId(approvalId); updateInfo.setSampleId(relation.getEquipmentId()); - updateInfo.setSampleStatus(SampleStatusEnum.GIVE_BACK_COMPLETE.getSampleStatus()); - updateInfo.setFinishTime(new Date()); + updateInfo.setSampleStatus(SampleStatusEnum.IN_MEASURE.getSampleStatus()); +// updateInfo.setFinishTime(new Date()); updateInfo.setRealDeliverTime(new Date()); updateInfo.setMeasureCompany(subcontractor.getCompanyName()); + planEquipmentRelationService.sampleStatusUpdate(updateInfo); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/subcontract/ISubcontractCertificateService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/subcontract/ISubcontractCertificateService.java index b83620b..3e549f4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/subcontract/ISubcontractCertificateService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/subcontract/ISubcontractCertificateService.java @@ -43,7 +43,7 @@ void removeInfo(Long id); Page listScopePage(Page page, String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo,String equipmentManufacturer, String certificateValidStart, String certificateValidEnd, @@ -51,7 +51,7 @@ ); List listScope(String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo,String equipmentManufacturer, String certificateValidStart, String certificateValidEnd, diff --git a/casic-metering-common/pom.xml b/casic-metering-common/pom.xml index a31f9c1..470135e 100644 --- a/casic-metering-common/pom.xml +++ b/casic-metering-common/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -17,12 +17,12 @@ com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.github.oshi diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java new file mode 100644 index 0000000..fda9f0d --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/plan/OrderStatusEnum.java @@ -0,0 +1,13 @@ +package com.casic.missiles.enums.plan; + +import liquibase.pro.packaged.S; + +public interface OrderStatusEnum { + + String RECEIVE_STATUS_COMPLETE = "4"; // 接收状态-检测完成 + + + String ORDER_STATUS_TO_BACK = "6"; // 任务单状态 - 待取回 + + String ORDER_STATUS_BACKED = "7"; // 任务单状态 - 已取回 +} diff --git a/casic-metering-dao/pom.xml b/casic-metering-dao/pom.xml index d52996f..993d279 100644 --- a/casic-metering-dao/pom.xml +++ b/casic-metering-dao/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -16,7 +16,7 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java index 359c1f2..36aa2ed 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessOrderSampleRelationMapper.java @@ -10,6 +10,7 @@ import com.casic.missiles.dto.business.labExecutive.SampleHandOutListResponse; import com.casic.missiles.model.business.BizBusinessOrderSampleRelation; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; @@ -36,4 +37,10 @@ Page getSampleListByStatus(@Param("page") Page page, @Param("request") SampleDispatchListRequest request); List getSampleListByStatus(@Param("request") SampleDispatchListRequest request); + + @Select("select conclusion from biz_business_device_measure_info where order_id = #{orderId} and sample_id = #{sampleId} order by id desc limit 1") + String getConclusion(@Param("orderId")Long orderId,@Param("sampleId")Long sampleId); + + @Select("select count(*) from biz_business_order_sample_relation relation where order_id = #{orderId} and sample_status='5'") + Integer getUnBackCount(@Param("orderId")Long orderId); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml index e4a103f..5f5886b 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderListResponseMapper.xml @@ -42,7 +42,7 @@ select * from ( SELECT * --- ,(select dept_id from sys_user where id = create_user_id) as dept_id + ,(select count(*) from biz_business_order_sample_relation relation where relation.order_id = biz_business_order_info.id and sample_status='5') as unBackCount FROM biz_business_order_info ) t diff --git a/casic-metering-eqpt-api/pom.xml b/casic-metering-eqpt-api/pom.xml index 3335fec..1bb8180 100644 --- a/casic-metering-eqpt-api/pom.xml +++ b/casic-metering-eqpt-api/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -18,13 +18,13 @@ com.casic casic-metering-service - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-job - 1.3.2.0 + 1.3.3.0 org.springframework.boot diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 3dcc2aa..4e4fd24 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -52,13 +52,13 @@ @GetMapping("/listPage") @ResponseBody public ReturnDTO> listPage(String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo, String equipmentManufacturer, String certificateValidStart,String certificateValidEnd, String checkDateStart, String checkDateEnd) { Page page = PageFactory.defaultPage(); - page = certificateService.listScopePage(page, certificateNo, certificateName, equipmentNo, equipmentName, + page = certificateService.listScopePage(page, certificateNo, certificateName, equipmentNo, equipmentName,equipmentModel, subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo,equipmentManufacturer, certificateValidStart,certificateValidEnd,checkDateStart,checkDateEnd); @@ -69,14 +69,14 @@ @PostMapping("/export") @ResponseBody public void export(String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo,String equipmentManufacturer, String certificateValidStart,String certificateValidEnd, String checkDateStart, String checkDateEnd, @RequestParam("ids") List ids) throws IOException { List list = certificateService.listScope(certificateNo, certificateName, equipmentNo, - equipmentName, subcontractorName, createTimeStart, createTimeEnd, + equipmentName, equipmentModel,subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo,equipmentManufacturer, certificateValidStart,certificateValidEnd,checkDateStart,checkDateEnd, ids); diff --git a/casic-metering-job/pom.xml b/casic-metering-job/pom.xml index 0411c27..bae3416 100644 --- a/casic-metering-job/pom.xml +++ b/casic-metering-job/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -14,12 +14,12 @@ com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.github.oshi @@ -61,7 +61,7 @@ com.casic casic-metering-service - 1.3.2.0 + 1.3.3.0 compile diff --git a/casic-metering-model/pom.xml b/casic-metering-model/pom.xml index a18b82c..731b0bc 100644 --- a/casic-metering-model/pom.xml +++ b/casic-metering-model/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 8296d60..64b9c20 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -46,6 +46,8 @@ String PLAN_EXECUTE_STATUS = DICT_PREFIX + "PlanExecuteStatus"; // 计量计划检定完成度 String PLAN_CHECK_COMPLETION = DICT_PREFIX + "PlanCheckCompletion"; + + String EQPT_ORDER_STATUS = DICT_PREFIX + "TaskStatus"; // 文档变更类型 String FILE_LOG_TYPE = DICT_PREFIX + "FileLogType"; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java index 7de9c2d..c300fc1 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListRequest.java @@ -39,8 +39,11 @@ @ApiModelProperty(value = "出厂编号") private String manufactureNo; - @ApiModelProperty(value = "接收状态（包括接收相关状态和检测完成状态）", dataType = "String") - private String receiveStatus; +// @ApiModelProperty(value = "接收状态（包括接收相关状态和检测完成状态）", dataType = "String") +// private String receiveStatus; + + @ApiModelProperty(value = "任务单状态", dataType = "String") + private String orderStatus; @ApiModelProperty(value = "是否现场检定") private Integer isOnSiteCheck; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java index f17b7a7..3e92a46 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/OrderListResponse.java @@ -57,13 +57,30 @@ @ApiModelProperty(value = "接收状态名称", dataType = "String") private String receiveStatusName; + @ApiModelProperty(value = "任务单状态", dataType = "String") + @DictCodeField(message = "任务单状态不合法", cacheName = MeterDictCode.EQPT_ORDER_STATUS) + @TableField(exist = false) + private String orderStatus; + + @TableField(exist = false) + @ApiModelProperty(value = "任务单状态名称", dataType = "String") + private String orderStatusName; + + @TableField(exist = false) + @ApiModelProperty(hidden = true) + private Integer unBackCount; + + @ApiModelProperty(value = "创建人名字", dataType = "String") private String createUserName; @ApiModelProperty(value = "创建时间", dataType = "String") private String createTime; - @ApiModelProperty(value = "计划送检时间", dataType = "String") + @ApiModelProperty(value = "要求检完时间", dataType = "String") private String requireOverTime; + @ApiModelProperty(value = "预计送达时间", dataType = "String") + private String planDeliverTime; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java index 5773c4e..be0e35a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/EquipmentRemindList.java @@ -40,6 +40,14 @@ @ApiModelProperty("使用状态名称") private String usageStatusName; + + @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_CHECK_DESTINATION,needValid = true,message = "检定去向不合法") + @ApiModelProperty(value = "检定去向",notes = "检定去向") + private String checkDestination; + + @ApiModelProperty("检定去向名称") + private String checkDestinationName; + @ApiModelProperty("计量标识") @DictCodeField(cacheName = MeterDictCode.EQUIPMENT_METER_IDENTITY) private String meterIdentify; @@ -57,4 +65,7 @@ @ApiModelProperty("检定状态名称") private String checkStatusName; + + + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java index 74e2d2a..ed74deb 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderInfo.java @@ -167,6 +167,16 @@ @ApiModelProperty(value = "接收状态名称", dataType = "String") private String receiveStatusName; + + @ApiModelProperty(value = "任务单状态", dataType = "String") + @DictCodeField(message = "任务单状态不合法", cacheName = MeterDictCode.EQPT_ORDER_STATUS) + @TableField(exist = false) + private String orderStatus; + + @TableField(exist = false) + @ApiModelProperty(value = "任务单状态名称", dataType = "String") + private String orderStatusName; + /** * 接收说明 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java index 381fa37..badaaab 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessOrderSampleRelation.java @@ -81,13 +81,13 @@ @TableField(exist = false) - @ApiModelProperty("接收状态名称") + @ApiModelProperty("样品状态名称") private String sampleStatusName; /** * 样品在本次委托中的备注 */ - @ApiModelProperty(value = "样品在本次委托中的备注", dataType = "String") + @ApiModelProperty(value = "样品在本次委托中的备注（退回/补送原因，接收状态说明）", dataType = "String") @TableField("remark") private String remark; @@ -140,7 +140,23 @@ @TableField("measure_content") private String measureContent; - @ApiModelProperty(value = "检定完成度", dataType = "String") + @ApiModelProperty(value = "接收状态") + @TableField(exist = false) + private String receiveStatusName; + + public String getReceiveStatusName() { + if("1".equals(sampleStatus)){ + return "未接收"; + }else if("9".equals(sampleStatus)){ + return "待补送"; + }else if("10".equals(sampleStatus)){ + return "已退回"; + }else { + return "已接收"; + } + } + + @ApiModelProperty(value = "检定完成度(检定结果)", dataType = "String") @TableField(exist = false) private String measureCompletePercent; @@ -150,7 +166,7 @@ } else if("3".equals(sampleStatus) || "4".equals(sampleStatus) || "8".equals(sampleStatus)){ return "检定中"; } else if("5".equals(sampleStatus) || "6".equals(sampleStatus)){ - return "检定完"; + return "已检完"; } else if("10".equals(sampleStatus)){ return "已退回"; } @@ -161,6 +177,14 @@ @TableField("measure_complete_time") private String measureCompleteTime; + @ApiModelProperty("检定结果附加（合格/不合格/退回）") + @TableField(exist = false) + private String conclusion; + + @ApiModelProperty("检定说明") + @TableField(exist = false) + private String measureRemark; + @ApiModelProperty(value = "创建时间", dataType = "String") @TableField("create_time") private String createTime; diff --git a/casic-metering-service/pom.xml b/casic-metering-service/pom.xml index cbe6893..edcb882 100644 --- a/casic-metering-service/pom.xml +++ b/casic-metering-service/pom.xml @@ -5,7 +5,7 @@ casic-metering-eqpt-xichang com.casic - 1.3.2.0 + 1.3.3.0 4.0.0 @@ -16,19 +16,19 @@ com.casic casic-metering-dao - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-model - 1.3.2.0 + 1.3.3.0 com.casic casic-metering-common - 1.3.2.0 + 1.3.3.0 org.springframework.boot diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java index 569773a..1cc3e68 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/BizBusinessOrderInfoServiceImpl.java @@ -18,6 +18,8 @@ import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.enums.business.MeasureTypeEnum; import com.casic.missiles.enums.business.OrderStatusDictEnum; +import com.casic.missiles.enums.plan.CheckCompletionEnum; +import com.casic.missiles.enums.plan.OrderStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BizBusinessOrderInfoMapper; import com.casic.missiles.mapper.business.BizBusinessOrderSampleRelationMapper; @@ -71,24 +73,79 @@ List list = orderListResponseMapper.listPage(page, wrapper); page.setRecords(list); for (OrderListResponse customerAdviceInfo : page.getRecords()) { - DictCodeUtils.convertDictCodeToName(customerAdviceInfo); + customerAdviceInfo.setDeptName(systemDeptService.getParentsDeptName(customerAdviceInfo.getDeptId())); + + if(StrUtil.isNotEmpty(customerAdviceInfo.getReceiveStatus())){ + customerAdviceInfo.setOrderStatus(customerAdviceInfo.getReceiveStatus()); + if(OrderStatusEnum.RECEIVE_STATUS_COMPLETE.equals(customerAdviceInfo.getReceiveStatus())){ + if(customerAdviceInfo.getUnBackCount() > 0){ + customerAdviceInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_TO_BACK); + }else { + customerAdviceInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_BACKED); + } + } + } + + if(StrUtil.isNotEmpty(customerAdviceInfo.getRequireOverTime())){ + customerAdviceInfo.setRequireOverTime(customerAdviceInfo.getRequireOverTime().substring(0,10)); + } + if(StrUtil.isNotEmpty(customerAdviceInfo.getPlanDeliverTime())){ + customerAdviceInfo.setPlanDeliverTime(customerAdviceInfo.getPlanDeliverTime().substring(0,10)); + } + + DictCodeUtils.convertDictCodeToName(customerAdviceInfo); } return page; } + private String getConclusion(Long orderId,Long sampleId){ + String conclusion = sampleRelationMapper.getConclusion(orderId,sampleId); + if(StrUtil.isNotBlank(conclusion)){ + if(conclusion.contains("不合格")){ + return "不合格"; + }else if(conclusion.contains("其余所检项目合格")){ + return "限用"; + }else { + return "合格"; + } + } + return conclusion; + } + @Override public ReturnDTO orderDetail(Long id) throws Exception { // todo 交接单编号及pdf打印 BizBusinessOrderInfo orderInfo = this.baseMapper.selectById(id); + + if(StrUtil.isNotEmpty(orderInfo.getReceiveStatus())){ + orderInfo.setOrderStatus(orderInfo.getReceiveStatus()); + if(OrderStatusEnum.RECEIVE_STATUS_COMPLETE.equals(orderInfo.getReceiveStatus())){ + Integer unBackCount = sampleRelationMapper.getUnBackCount(id); + if(unBackCount > 0){ + orderInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_TO_BACK); + }else { + orderInfo.setOrderStatus(OrderStatusEnum.ORDER_STATUS_BACKED); + } + } + } + DictCodeUtils.convertDictCodeToName(orderInfo); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.select("*","(select manufacturer from eqpt_equipment_info e where e.id = sample_id) as sampleManufacturer" - ,"(select manufacture_no from eqpt_equipment_info e where e.id = sample_id) as sampleManufactureNo"); + ,"(select manufacture_no from eqpt_equipment_info e where e.id = sample_id) as sampleManufactureNo" + ,"(select GROUP_CONCAT(remark) from biz_business_device_measure_info m where m.sample_id = biz_business_order_sample_relation.sample_id" + + " AND m.order_id = biz_business_order_sample_relation.order_id ) as measureRemark"); wrapper.eq("order_id", orderInfo.getId()); List orderSampleList = sampleRelationMapper.selectList(wrapper); - for (BizBusinessOrderSampleRelation bizBusinessOrderSampleRelation : orderSampleList) { - DictCodeUtils.convertDictCodeToName(bizBusinessOrderSampleRelation); + for (BizBusinessOrderSampleRelation relation : orderSampleList) { + if(StrUtil.isNotEmpty(relation.getMeasureCompleteTime())){ + relation.setMeasureCompleteTime(relation.getMeasureCompleteTime().substring(0,10)); + } + if("已检完".equals(relation.getMeasureCompletePercent())){ + relation.setConclusion(getConclusion(relation.getOrderId(), relation.getSampleId())); + } + DictCodeUtils.convertDictCodeToName(relation); } orderInfo.setCustomerSampleInfoList(orderSampleList); return ReturnUtil.success(orderInfo); @@ -179,9 +236,21 @@ } wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()),"measure_company",request.getMeasureCompany()); - wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus()); +// wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus()); wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()),"is_on_site_check",request.getIsOnSiteCheck()); + if(StrUtil.isNotEmpty(request.getOrderStatus())){ + if(OrderStatusEnum.ORDER_STATUS_TO_BACK.equals(request.getOrderStatus())){ + wrapper.eq("receive_status",OrderStatusEnum.RECEIVE_STATUS_COMPLETE); + wrapper.gt("unBackCount",0); + }else if(OrderStatusEnum.ORDER_STATUS_BACKED.equals(request.getOrderStatus())){ + wrapper.eq("receive_status",OrderStatusEnum.RECEIVE_STATUS_COMPLETE); + wrapper.le("unBackCount",0); + }else { + wrapper.eq("receive_status",request.getOrderStatus()); + } + } + if(ObjectUtil.isNotEmpty(request.getUsePositionId())){ String positionSql = String.format("(select id from eqpt_equipment_info e where e.id in (select sample_id from biz_business_order_sample_relation r where r.order_id = t.id) and e.use_position_id = %s)",request.getUsePositionId()); wrapper.exists(positionSql); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java index 7117130..f17c2d2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/business/EqptBusinessOrderInfoServiceImpl.java @@ -161,7 +161,7 @@ wrapper.eq(ObjectUtil.isNotEmpty(request.getDeptId()),"create_dept_id",request.getDeptId()); wrapper.like(StrUtil.isNotEmpty(request.getMeasureCompany()),"measure_company",request.getMeasureCompany()); - wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus()); +// wrapper.eq(StrUtil.isNotEmpty(request.getReceiveStatus()),"receive_status",request.getReceiveStatus()); wrapper.eq(ObjectUtil.isNotEmpty(request.getIsOnSiteCheck()),"is_on_site_check",request.getIsOnSiteCheck()); if(ObjectUtil.isNotEmpty(request.getUsePositionId())){ diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java index a3cc46c..d978812 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java @@ -15,21 +15,20 @@ import com.casic.missiles.core.model.auth.AuthUser; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.board.EquipmentStatisticsList; import com.casic.missiles.dto.certificate.SubcontractCertificateImportDTO; import com.casic.missiles.dto.equipment.EquipmentCertificateDTO; -import com.casic.missiles.dto.equipment.EquipmentImportDTO; -import com.casic.missiles.dto.system.RfidImportDTO; -import com.casic.missiles.enums.ApprovalStatusEnum; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.plan.SampleStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.listeners.CommonExcelListener; import com.casic.missiles.model.equipment.EquipmentInfo; +import com.casic.missiles.model.plan.SampleStatueUpdate; import com.casic.missiles.model.subcontract.SubcontractCertificate; import com.casic.missiles.mapper.subcontract.SubcontractCertificateMapper; import com.casic.missiles.model.subcontract.Subcontractor; import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.service.equipment.IEquipmentInfoService; +import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.subcontract.ISubcontractCertificateService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.service.subcontract.ISubcontractorService; @@ -37,7 +36,6 @@ import com.casic.missiles.utils.FileUtil; import com.casic.missiles.utils.MinioUtil; import lombok.RequiredArgsConstructor; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -75,6 +73,7 @@ private final AbstractDictService dictService; private IEquipmentInfoService equipmentInfoService; private ISubcontractorService subcontractorService; + private final IPlanEquipmentRelationService planEquipmentRelationService; @Value("${casic.role.operator: user}") private String operatorRoleTip; @@ -196,6 +195,7 @@ throw new BusinessException(1500, String.format(validMsg, i + 1, "检测单位名称与名录不一致")); } importDTO.setSubcontractorId(subcontractor.getId()); + importDTO.setSubcontractorName(subcontractor.getCompanyName()); } else { throw new BusinessException(1500, String.format(validMsg, i + 1, "检测单位不存在")); } @@ -284,6 +284,9 @@ SubcontractCertificate latest = subList.get(subList.size() - 1); equipmentInfoService.updateCertificateInfo(equipmentId, latest.getSubcontractorName(), latest.getCheckDate(), latest.getCertificateValid(), latest.getMeterIdentify(),latest.getLimitInstruction()); } + for (SubcontractCertificate certificate : resultList) { + updatePlanSampleStatus(certificate); + } } @Override @@ -424,8 +427,20 @@ @Override @Transactional public void saveOrUpdateInfo(SubcontractCertificate entity) { + boolean save = ObjectUtil.isEmpty(entity.getId()); this.saveOrUpdate(entity); equipmentInfoService.updateCertificateInfo(entity.getEquipmentId(), entity.getSubcontractorName(), entity.getCheckDate(), entity.getCertificateValid(), entity.getMeterIdentify()); + if(save){ + updatePlanSampleStatus(entity); + } + } + + private void updatePlanSampleStatus(SubcontractCertificate certificate){ + SampleStatueUpdate updateInfo = new SampleStatueUpdate(); + updateInfo.setSampleId(certificate.getEquipmentId()); + updateInfo.setSampleStatus(SampleStatusEnum.GIVE_BACK_COMPLETE.getSampleStatus()); + updateInfo.setFinishTime(new Date()); + planEquipmentRelationService.sampleStatusUpdate(updateInfo); } @Override @@ -437,7 +452,7 @@ @Override public Page listScopePage(Page page, String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName, String equipmentModel,String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo, String equipmentManufacturer, String certificateValidStart, String certificateValidEnd, @@ -445,7 +460,7 @@ DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); dataScope.setScopeName("c.create_dept_id"); QueryWrapper queryWrapper = commonQuery(certificateNo, certificateName, equipmentNo, - equipmentName, subcontractorName, createTimeStart, createTimeEnd, + equipmentName, equipmentModel,subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo, equipmentManufacturer, certificateValidStart, certificateValidEnd, checkDateStart, checkDateEnd); List list = this.baseMapper.listScopePage(dataScope, page, queryWrapper); @@ -458,7 +473,7 @@ @Override public List listScope(String certificateNo, String certificateName, String equipmentNo, - String equipmentName, String subcontractorName, + String equipmentName, String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo, String equipmentManufacturer, String certificateValidStart, String certificateValidEnd, @@ -471,7 +486,7 @@ queryWrapper = new QueryWrapper<>(); queryWrapper.in("c.id", ids); } else { - queryWrapper = commonQuery(certificateNo, certificateName, equipmentNo, equipmentName, subcontractorName, + queryWrapper = commonQuery(certificateNo, certificateName, equipmentNo, equipmentName, equipmentModel, subcontractorName, createTimeStart, createTimeEnd, equipmentManufactureNo, equipmentManufacturer, certificateValidStart, certificateValidEnd, checkDateStart, checkDateEnd); @@ -502,7 +517,7 @@ } private QueryWrapper commonQuery(String certificateNo, String certificateName, String equipmentNo, - String equipmentName, String subcontractorName, + String equipmentName, String equipmentModel,String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo, String equipmentManufacturer, String certificateValidStart, String certificateValidEnd, @@ -525,6 +540,9 @@ if (StrUtil.isNotEmpty(equipmentName)) { queryWrapper.eq("e.equipment_name", equipmentName); } + if (StrUtil.isNotEmpty(equipmentModel)) { + queryWrapper.eq("e.model", equipmentModel); + } if (StrUtil.isNotEmpty(equipmentManufactureNo)) { queryWrapper.like("e.manufacture_no", equipmentManufactureNo); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java index 67be945..362252d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java @@ -18,6 +18,7 @@ import com.casic.missiles.model.subcontract.Subcontractor; import com.casic.missiles.service.impl.CommonApprovalServiceImpl; import com.casic.missiles.service.listeners.register.PrintFileRegister; +import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.subcontract.ISubcontractOrderRelationService; import com.casic.missiles.service.subcontract.ISubcontractOrderService; import com.casic.missiles.service.subcontract.ISubcontractorService; @@ -54,6 +55,8 @@ @Autowired private ISubcontractorService subcontractorService; @Autowired + private IPlanEquipmentRelationService planEquipmentRelationService; + @Autowired private ISystemDeptService systemDeptService; @Autowired private PrintFileRegister printFileRegister; @@ -183,10 +186,12 @@ SampleStatueUpdate updateInfo = new SampleStatueUpdate(); updateInfo.setOrderId(approvalId); updateInfo.setSampleId(relation.getEquipmentId()); - updateInfo.setSampleStatus(SampleStatusEnum.GIVE_BACK_COMPLETE.getSampleStatus()); - updateInfo.setFinishTime(new Date()); + updateInfo.setSampleStatus(SampleStatusEnum.IN_MEASURE.getSampleStatus()); +// updateInfo.setFinishTime(new Date()); updateInfo.setRealDeliverTime(new Date()); updateInfo.setMeasureCompany(subcontractor.getCompanyName()); + planEquipmentRelationService.sampleStatusUpdate(updateInfo); + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/subcontract/ISubcontractCertificateService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/subcontract/ISubcontractCertificateService.java index b83620b..3e549f4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/subcontract/ISubcontractCertificateService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/subcontract/ISubcontractCertificateService.java @@ -43,7 +43,7 @@ void removeInfo(Long id); Page listScopePage(Page page, String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo,String equipmentManufacturer, String certificateValidStart, String certificateValidEnd, @@ -51,7 +51,7 @@ ); List listScope(String certificateNo, String certificateName, - String equipmentNo, String equipmentName, String subcontractorName, + String equipmentNo, String equipmentName,String equipmentModel, String subcontractorName, String createTimeStart, String createTimeEnd, String equipmentManufactureNo,String equipmentManufacturer, String certificateValidStart, String certificateValidEnd, diff --git a/pom.xml b/pom.xml index 5e6c7a1..35ace5f 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.casic casic-metering-eqpt-xichang - 1.3.2.0 + 1.3.3.0 casic-metering-eqpt-xichang pom