diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index e1b9b4b..48a2bfa 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -127,7 +127,7 @@ - SELECT bbdmii.*, eemi.category AS deviceType, eemi.equipment_name AS deviceName, + SELECT bbdmii.*, eemi.equipment_name AS deviceName, eemi.model AS model, eemi.help_instruction AS helpInstruction, eemi.instructions_file AS instructionsFile, eemi.check_cycle AS checkCycle, eemi.id AS eqptDeviceModelId, eemi.category AS eqptDeviceType FROM eqpt_equipment_model_info eemi diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index b39d0ec..6dab4f9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -309,6 +309,7 @@ l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); } }); + return (List) list; } return new ArrayList<>(); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml index e1b9b4b..48a2bfa 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureItemInfoMapper.xml @@ -127,7 +127,7 @@ - SELECT bbdmii.*, eemi.category AS deviceType, eemi.equipment_name AS deviceName, + SELECT bbdmii.*, eemi.equipment_name AS deviceName, eemi.model AS model, eemi.help_instruction AS helpInstruction, eemi.instructions_file AS instructionsFile, eemi.check_cycle AS checkCycle, eemi.id AS eqptDeviceModelId, eemi.category AS eqptDeviceType FROM eqpt_equipment_model_info eemi diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java index b39d0ec..6dab4f9 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/GeneralApprovalServiceImpl.java @@ -309,6 +309,7 @@ l.setApprovalStatus(ApprovalStatusEnum.TO_BE_APPROVED); } }); + return (List) list; } return new ArrayList<>(); } 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 27f3eb9..72753da 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 @@ -245,6 +245,13 @@ } else if (2 == sampleApplyRequest.getType()) { //退回 updateFlag = sampleRelationMapper.updateByOrderIdAndSampleId(orderId, sampleId, SampleStatusEnum.GO_BACK, remark); + //将已分发到实验室的任务置为已退回（若有） + UpdateWrapper wrapper = new UpdateWrapper<>(); + wrapper.eq("order_id", orderId); + wrapper.eq("sample_id", sampleId); + BusinessLabExecutiveInfo executiveInfo = new BusinessLabExecutiveInfo(); + executiveInfo.setMeasureStatus(MeasureStatusEnum.SEND_BACK); + labExecutiveInfoMapper.update(executiveInfo, wrapper); } if (updateFlag <= 0) { throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/BizWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/BizWorkbenchServiceImpl.java index 91a7bdf..6f5d6a2 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/BizWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/workbench/BizWorkbenchServiceImpl.java @@ -325,8 +325,7 @@ if (1 == approvalType) convertForCertificatePrint(resultList, applyFromIdEnum, 1); else convertForCertificatePrint(resultList, applyFromIdEnum, 2); } else { - if (1 == approvalType) - convertTobeApproved(SpringContextUtil.getBean(beanName), applyFromIdEnum, resultList); + if (1 == approvalType) convertTobeApproved(SpringContextUtil.getBean(beanName), applyFromIdEnum, resultList); else convertApproved(SpringContextUtil.getBean(beanName), applyFromIdEnum, resultList); } });