diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml index 8a889f7..f84a2cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml @@ -53,18 +53,18 @@ FROM eqpt_equipment_info WHERE is_del=0 ) csi - WHERE id NOT IN + WHERE csi.sampleId NOT IN ( SELECT sample_id - FROM business_order_sample_relation bosr + FROM biz_business_order_sample_relation bosr JOIN ( SELECT id - FROM business_order + FROM biz_business_order_info WHERE 1=1 - + AND customer_id=#{customerId} - AND (status ='2' OR status ='1' OR status ='') + AND (receive_status ='2' OR receive_status ='1' OR receive_status ='') ) bo ON bo.id=bosr.order_id ) diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml index 8a889f7..f84a2cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml @@ -53,18 +53,18 @@ FROM eqpt_equipment_info WHERE is_del=0 ) csi - WHERE id NOT IN + WHERE csi.sampleId NOT IN ( SELECT sample_id - FROM business_order_sample_relation bosr + FROM biz_business_order_sample_relation bosr JOIN ( SELECT id - FROM business_order + FROM biz_business_order_info WHERE 1=1 - + AND customer_id=#{customerId} - AND (status ='2' OR status ='1' OR status ='') + AND (receive_status ='2' OR receive_status ='1' OR receive_status ='') ) bo ON bo.id=bosr.order_id ) diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index eb53e55..66ebdb5 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -130,7 +130,7 @@ SELECT bosr.id, eei.id AS sampleId, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, bo.order_no, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time, bosr.measure_type, bo.plan_deliver_time, bosr.return_time, eei.RFID AS labelBind, eei.model AS sampleModel, eei.manufacture_no, - eei.certificate_valid AS certificateValid + eei.certificate_valid AS certificateValid, bosr.appendix_descn, bosr.appearance_inspect, bosr.special_require, bosr.measure_content FROM ( SELECT * @@ -279,13 +279,13 @@ AND eei.id NOT IN ( - SELECT sample_id - FROM biz_business_order_sample_relation bosrr - JOIN ( - SELECT id - FROM biz_business_order_info - WHERE status ='2' OR status ='1' OR status ='' - )boo ON boo.id = bosrr.order_id + SELECT sample_id + FROM biz_business_order_sample_relation bosrr + JOIN ( + SELECT id + FROM biz_business_order_info + WHERE receive_status ='2' OR receive_status ='1' OR receive_status ='' + )boo ON boo.id = bosrr.order_id ) ORDER BY eei.create_time DESC diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml index 8a889f7..f84a2cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml @@ -53,18 +53,18 @@ FROM eqpt_equipment_info WHERE is_del=0 ) csi - WHERE id NOT IN + WHERE csi.sampleId NOT IN ( SELECT sample_id - FROM business_order_sample_relation bosr + FROM biz_business_order_sample_relation bosr JOIN ( SELECT id - FROM business_order + FROM biz_business_order_info WHERE 1=1 - + AND customer_id=#{customerId} - AND (status ='2' OR status ='1' OR status ='') + AND (receive_status ='2' OR receive_status ='1' OR receive_status ='') ) bo ON bo.id=bosr.order_id ) diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index eb53e55..66ebdb5 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -130,7 +130,7 @@ SELECT bosr.id, eei.id AS sampleId, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, bo.order_no, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time, bosr.measure_type, bo.plan_deliver_time, bosr.return_time, eei.RFID AS labelBind, eei.model AS sampleModel, eei.manufacture_no, - eei.certificate_valid AS certificateValid + eei.certificate_valid AS certificateValid, bosr.appendix_descn, bosr.appearance_inspect, bosr.special_require, bosr.measure_content FROM ( SELECT * @@ -279,13 +279,13 @@ AND eei.id NOT IN ( - SELECT sample_id - FROM biz_business_order_sample_relation bosrr - JOIN ( - SELECT id - FROM biz_business_order_info - WHERE status ='2' OR status ='1' OR status ='' - )boo ON boo.id = bosrr.order_id + SELECT sample_id + FROM biz_business_order_sample_relation bosrr + JOIN ( + SELECT id + FROM biz_business_order_info + WHERE receive_status ='2' OR receive_status ='1' OR receive_status ='' + )boo ON boo.id = bosrr.order_id ) ORDER BY eei.create_time DESC diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java index bb60ee9..7bcc149 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java @@ -49,4 +49,16 @@ @ApiModelProperty(value = "证书有效期", dataType = "String") private String certificateValid; + + @ApiModelProperty(value = "样品在本次委托中的附件说明", dataType = "String") + private String appendixDescn; + + @ApiModelProperty(value = "样品在本次委托中的外观和功能检查", dataType = "String") + private String appearanceInspect; + + @ApiModelProperty(value = "样品在本次委托中的特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = "样品在本次委托中的检定项目", dataType = "String") + private String measureContent; } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml index 8a889f7..f84a2cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml @@ -53,18 +53,18 @@ FROM eqpt_equipment_info WHERE is_del=0 ) csi - WHERE id NOT IN + WHERE csi.sampleId NOT IN ( SELECT sample_id - FROM business_order_sample_relation bosr + FROM biz_business_order_sample_relation bosr JOIN ( SELECT id - FROM business_order + FROM biz_business_order_info WHERE 1=1 - + AND customer_id=#{customerId} - AND (status ='2' OR status ='1' OR status ='') + AND (receive_status ='2' OR receive_status ='1' OR receive_status ='') ) bo ON bo.id=bosr.order_id ) diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index eb53e55..66ebdb5 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -130,7 +130,7 @@ SELECT bosr.id, eei.id AS sampleId, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, bo.order_no, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time, bosr.measure_type, bo.plan_deliver_time, bosr.return_time, eei.RFID AS labelBind, eei.model AS sampleModel, eei.manufacture_no, - eei.certificate_valid AS certificateValid + eei.certificate_valid AS certificateValid, bosr.appendix_descn, bosr.appearance_inspect, bosr.special_require, bosr.measure_content FROM ( SELECT * @@ -279,13 +279,13 @@ AND eei.id NOT IN ( - SELECT sample_id - FROM biz_business_order_sample_relation bosrr - JOIN ( - SELECT id - FROM biz_business_order_info - WHERE status ='2' OR status ='1' OR status ='' - )boo ON boo.id = bosrr.order_id + SELECT sample_id + FROM biz_business_order_sample_relation bosrr + JOIN ( + SELECT id + FROM biz_business_order_info + WHERE receive_status ='2' OR receive_status ='1' OR receive_status ='' + )boo ON boo.id = bosrr.order_id ) ORDER BY eei.create_time DESC diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java index bb60ee9..7bcc149 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java @@ -49,4 +49,16 @@ @ApiModelProperty(value = "证书有效期", dataType = "String") private String certificateValid; + + @ApiModelProperty(value = "样品在本次委托中的附件说明", dataType = "String") + private String appendixDescn; + + @ApiModelProperty(value = "样品在本次委托中的外观和功能检查", dataType = "String") + private String appearanceInspect; + + @ApiModelProperty(value = "样品在本次委托中的特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = "样品在本次委托中的检定项目", dataType = "String") + private String measureContent; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/SampleDispatchListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/SampleDispatchListResponse.java index fdf678c..f132aa7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/SampleDispatchListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/SampleDispatchListResponse.java @@ -108,4 +108,16 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty(value = "样品在本次委托中的附件说明", dataType = "String") + private String appendixDescn; + + @ApiModelProperty(value = "样品在本次委托中的外观和功能检查", dataType = "String") + private String appearanceInspect; + + @ApiModelProperty(value = "样品在本次委托中的特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = "样品在本次委托中的检定项目", dataType = "String") + private String measureContent; + } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml index 8a889f7..f84a2cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml @@ -53,18 +53,18 @@ FROM eqpt_equipment_info WHERE is_del=0 ) csi - WHERE id NOT IN + WHERE csi.sampleId NOT IN ( SELECT sample_id - FROM business_order_sample_relation bosr + FROM biz_business_order_sample_relation bosr JOIN ( SELECT id - FROM business_order + FROM biz_business_order_info WHERE 1=1 - + AND customer_id=#{customerId} - AND (status ='2' OR status ='1' OR status ='') + AND (receive_status ='2' OR receive_status ='1' OR receive_status ='') ) bo ON bo.id=bosr.order_id ) diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index eb53e55..66ebdb5 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -130,7 +130,7 @@ SELECT bosr.id, eei.id AS sampleId, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, bo.order_no, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time, bosr.measure_type, bo.plan_deliver_time, bosr.return_time, eei.RFID AS labelBind, eei.model AS sampleModel, eei.manufacture_no, - eei.certificate_valid AS certificateValid + eei.certificate_valid AS certificateValid, bosr.appendix_descn, bosr.appearance_inspect, bosr.special_require, bosr.measure_content FROM ( SELECT * @@ -279,13 +279,13 @@ AND eei.id NOT IN ( - SELECT sample_id - FROM biz_business_order_sample_relation bosrr - JOIN ( - SELECT id - FROM biz_business_order_info - WHERE status ='2' OR status ='1' OR status ='' - )boo ON boo.id = bosrr.order_id + SELECT sample_id + FROM biz_business_order_sample_relation bosrr + JOIN ( + SELECT id + FROM biz_business_order_info + WHERE receive_status ='2' OR receive_status ='1' OR receive_status ='' + )boo ON boo.id = bosrr.order_id ) ORDER BY eei.create_time DESC diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java index bb60ee9..7bcc149 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java @@ -49,4 +49,16 @@ @ApiModelProperty(value = "证书有效期", dataType = "String") private String certificateValid; + + @ApiModelProperty(value = "样品在本次委托中的附件说明", dataType = "String") + private String appendixDescn; + + @ApiModelProperty(value = "样品在本次委托中的外观和功能检查", dataType = "String") + private String appearanceInspect; + + @ApiModelProperty(value = "样品在本次委托中的特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = "样品在本次委托中的检定项目", dataType = "String") + private String measureContent; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/SampleDispatchListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/SampleDispatchListResponse.java index fdf678c..f132aa7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/SampleDispatchListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/SampleDispatchListResponse.java @@ -108,4 +108,16 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty(value = "样品在本次委托中的附件说明", dataType = "String") + private String appendixDescn; + + @ApiModelProperty(value = "样品在本次委托中的外观和功能检查", dataType = "String") + private String appearanceInspect; + + @ApiModelProperty(value = "样品在本次委托中的特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = "样品在本次委托中的检定项目", dataType = "String") + private String measureContent; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java index 09d2d16..e3c3847 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java @@ -98,6 +98,9 @@ @JSONField(format = "yyyy-MM-dd HH:mm:ss") private Date finishTime; + @ApiModelProperty("会签/或签（1/2）") + private Integer countersignOrSign; + @Data @Builder diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml index 8a889f7..f84a2cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml @@ -53,18 +53,18 @@ FROM eqpt_equipment_info WHERE is_del=0 ) csi - WHERE id NOT IN + WHERE csi.sampleId NOT IN ( SELECT sample_id - FROM business_order_sample_relation bosr + FROM biz_business_order_sample_relation bosr JOIN ( SELECT id - FROM business_order + FROM biz_business_order_info WHERE 1=1 - + AND customer_id=#{customerId} - AND (status ='2' OR status ='1' OR status ='') + AND (receive_status ='2' OR receive_status ='1' OR receive_status ='') ) bo ON bo.id=bosr.order_id ) diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index eb53e55..66ebdb5 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -130,7 +130,7 @@ SELECT bosr.id, eei.id AS sampleId, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, bo.order_no, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time, bosr.measure_type, bo.plan_deliver_time, bosr.return_time, eei.RFID AS labelBind, eei.model AS sampleModel, eei.manufacture_no, - eei.certificate_valid AS certificateValid + eei.certificate_valid AS certificateValid, bosr.appendix_descn, bosr.appearance_inspect, bosr.special_require, bosr.measure_content FROM ( SELECT * @@ -279,13 +279,13 @@ AND eei.id NOT IN ( - SELECT sample_id - FROM biz_business_order_sample_relation bosrr - JOIN ( - SELECT id - FROM biz_business_order_info - WHERE status ='2' OR status ='1' OR status ='' - )boo ON boo.id = bosrr.order_id + SELECT sample_id + FROM biz_business_order_sample_relation bosrr + JOIN ( + SELECT id + FROM biz_business_order_info + WHERE receive_status ='2' OR receive_status ='1' OR receive_status ='' + )boo ON boo.id = bosrr.order_id ) ORDER BY eei.create_time DESC diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java index bb60ee9..7bcc149 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java @@ -49,4 +49,16 @@ @ApiModelProperty(value = "证书有效期", dataType = "String") private String certificateValid; + + @ApiModelProperty(value = "样品在本次委托中的附件说明", dataType = "String") + private String appendixDescn; + + @ApiModelProperty(value = "样品在本次委托中的外观和功能检查", dataType = "String") + private String appearanceInspect; + + @ApiModelProperty(value = "样品在本次委托中的特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = "样品在本次委托中的检定项目", dataType = "String") + private String measureContent; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/SampleDispatchListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/SampleDispatchListResponse.java index fdf678c..f132aa7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/SampleDispatchListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/SampleDispatchListResponse.java @@ -108,4 +108,16 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty(value = "样品在本次委托中的附件说明", dataType = "String") + private String appendixDescn; + + @ApiModelProperty(value = "样品在本次委托中的外观和功能检查", dataType = "String") + private String appearanceInspect; + + @ApiModelProperty(value = "样品在本次委托中的特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = "样品在本次委托中的检定项目", dataType = "String") + private String measureContent; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java index 09d2d16..e3c3847 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java @@ -98,6 +98,9 @@ @JSONField(format = "yyyy-MM-dd HH:mm:ss") private Date finishTime; + @ApiModelProperty("会签/或签（1/2）") + private Integer countersignOrSign; + @Data @Builder diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java index a25007a..9bc2dcc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java @@ -105,6 +105,27 @@ flowTask.setComment(ApprovalLogResponse.FlowCommentDto.builder().type(comment.getType()).comment(comment.getFullMessage()).build()); } }); + //判断会签or或签 + BpmnModel bpmnModel = repositoryService.getBpmnModel(histIns.getProcessDefinitionId()); + if (!histIns.getActivityName().contains("发起人")) { + Task task = taskService.createTaskQuery().taskId(histIns.getTaskId()).singleResult(); + if (Objects.nonNull(task)) { + FlowNode flowNode = (FlowNode) bpmnModel.getFlowElement(task.getTaskDefinitionKey()); + List outgoingFlows = flowNode.getOutgoingFlows(); + for (SequenceFlow outgoingFlow : outgoingFlows) { + FlowElement targetFlowElement = outgoingFlow.getSourceFlowElement(); + if (targetFlowElement instanceof UserTask) { + UserTask userTask = (UserTask) targetFlowElement; + //或签 + if ("${nrOfCompletedInstances/nrOfInstances > 0}".equals(userTask.getLoopCharacteristics().getCompletionCondition())) { + flowTask.setCountersignOrSign(2);//或签 + } else { + flowTask.setCountersignOrSign(1);//会签 + } + } + } + } + } hisFlowList.add(flowTask); } } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml index 8a889f7..f84a2cf 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderInfoMapper.xml @@ -53,18 +53,18 @@ FROM eqpt_equipment_info WHERE is_del=0 ) csi - WHERE id NOT IN + WHERE csi.sampleId NOT IN ( SELECT sample_id - FROM business_order_sample_relation bosr + FROM biz_business_order_sample_relation bosr JOIN ( SELECT id - FROM business_order + FROM biz_business_order_info WHERE 1=1 - + AND customer_id=#{customerId} - AND (status ='2' OR status ='1' OR status ='') + AND (receive_status ='2' OR receive_status ='1' OR receive_status ='') ) bo ON bo.id=bosr.order_id ) diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml index eb53e55..66ebdb5 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessOrderSampleRelationMapper.xml @@ -130,7 +130,7 @@ SELECT bosr.id, eei.id AS sampleId, eei.equipment_no AS sampleNo, eei.equipment_name AS sampleName, bo.order_no, bo.id AS orderId, bo.customer_id, bo.customer_name, bo.deliverer, bo.is_urgent, bo.require_over_time, bosr.sample_status, bosr.real_deliver_time, bosr.measure_type, bo.plan_deliver_time, bosr.return_time, eei.RFID AS labelBind, eei.model AS sampleModel, eei.manufacture_no, - eei.certificate_valid AS certificateValid + eei.certificate_valid AS certificateValid, bosr.appendix_descn, bosr.appearance_inspect, bosr.special_require, bosr.measure_content FROM ( SELECT * @@ -279,13 +279,13 @@ AND eei.id NOT IN ( - SELECT sample_id - FROM biz_business_order_sample_relation bosrr - JOIN ( - SELECT id - FROM biz_business_order_info - WHERE status ='2' OR status ='1' OR status ='' - )boo ON boo.id = bosrr.order_id + SELECT sample_id + FROM biz_business_order_sample_relation bosrr + JOIN ( + SELECT id + FROM biz_business_order_info + WHERE receive_status ='2' OR receive_status ='1' OR receive_status ='' + )boo ON boo.id = bosrr.order_id ) ORDER BY eei.create_time DESC diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java index bb60ee9..7bcc149 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/ReadSampleDTO.java @@ -49,4 +49,16 @@ @ApiModelProperty(value = "证书有效期", dataType = "String") private String certificateValid; + + @ApiModelProperty(value = "样品在本次委托中的附件说明", dataType = "String") + private String appendixDescn; + + @ApiModelProperty(value = "样品在本次委托中的外观和功能检查", dataType = "String") + private String appearanceInspect; + + @ApiModelProperty(value = "样品在本次委托中的特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = "样品在本次委托中的检定项目", dataType = "String") + private String measureContent; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/SampleDispatchListResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/SampleDispatchListResponse.java index fdf678c..f132aa7 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/SampleDispatchListResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/SampleDispatchListResponse.java @@ -108,4 +108,16 @@ @ApiModelProperty(value = "出厂编号", dataType = "String") private String manufactureNo; + @ApiModelProperty(value = "样品在本次委托中的附件说明", dataType = "String") + private String appendixDescn; + + @ApiModelProperty(value = "样品在本次委托中的外观和功能检查", dataType = "String") + private String appearanceInspect; + + @ApiModelProperty(value = "样品在本次委托中的特殊要求", dataType = "String") + private String specialRequire; + + @ApiModelProperty(value = "样品在本次委托中的检定项目", dataType = "String") + private String measureContent; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java index 09d2d16..e3c3847 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/flowable/ApprovalLogResponse.java @@ -98,6 +98,9 @@ @JSONField(format = "yyyy-MM-dd HH:mm:ss") private Date finishTime; + @ApiModelProperty("会签/或签（1/2）") + private Integer countersignOrSign; + @Data @Builder diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java index a25007a..9bc2dcc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/flowable/ApprovalOperateServiceImpl.java @@ -105,6 +105,27 @@ flowTask.setComment(ApprovalLogResponse.FlowCommentDto.builder().type(comment.getType()).comment(comment.getFullMessage()).build()); } }); + //判断会签or或签 + BpmnModel bpmnModel = repositoryService.getBpmnModel(histIns.getProcessDefinitionId()); + if (!histIns.getActivityName().contains("发起人")) { + Task task = taskService.createTaskQuery().taskId(histIns.getTaskId()).singleResult(); + if (Objects.nonNull(task)) { + FlowNode flowNode = (FlowNode) bpmnModel.getFlowElement(task.getTaskDefinitionKey()); + List outgoingFlows = flowNode.getOutgoingFlows(); + for (SequenceFlow outgoingFlow : outgoingFlows) { + FlowElement targetFlowElement = outgoingFlow.getSourceFlowElement(); + if (targetFlowElement instanceof UserTask) { + UserTask userTask = (UserTask) targetFlowElement; + //或签 + if ("${nrOfCompletedInstances/nrOfInstances > 0}".equals(userTask.getLoopCharacteristics().getCompletionCondition())) { + flowTask.setCountersignOrSign(2);//或签 + } else { + flowTask.setCountersignOrSign(1);//会签 + } + } + } + } + } hisFlowList.add(flowTask); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java index d61569d..375d9e5 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/system/FlowDefDefServiceImpl.java @@ -741,10 +741,10 @@ // 设置多实例属性，多实例：会签情况下每个处理人对应一个实例 userTask.setLoopCharacteristics(multiInstanceLoopCharacteristics); //多人审批时采用的审批方式 1依次会签 2并行会签 3或签 - //默认并行会签，会签的实例存ACT_RU_IDENTITYLINK表，串行时表中会依次增加实例数据 + //默认或签，会签的实例存ACT_RU_IDENTITYLINK表，串行时表中会依次增加实例数据 if ("1".equals(examineMode)) { multiInstanceLoopCharacteristics.setSequential(true); - } else if ("3".equals(examineMode)) { + } else if (StringUtils.isEmpty(examineMode) || "3".equals(examineMode)) { //或签，即设置完成条件nrOfCompletedInstances/nrOfInstances > 0 //nrOfCompletedInstances:已完成的实例数量，nrOfInstances:实例总数 multiInstanceLoopCharacteristics.setCompletionCondition("${nrOfCompletedInstances/nrOfInstances > 0}");