diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java index 385406c..9b49201 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java @@ -21,6 +21,12 @@ String SCRAP = "4"; // 处置 String MANAGEMENT = "5"; + // 标准装置-在用 + String STANDARD_USE = "1"; + // 处置 + String STOP = "2"; + // 处置 + String REVOKE = "3"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java index 385406c..9b49201 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java @@ -21,6 +21,12 @@ String SCRAP = "4"; // 处置 String MANAGEMENT = "5"; + // 标准装置-在用 + String STANDARD_USE = "1"; + // 处置 + String STOP = "2"; + // 处置 + String REVOKE = "3"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java index 9d2e1c7..e7c492b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -41,11 +41,9 @@ String id = execution.getProcessInstanceBusinessKey(); switch (systemFlowForm.getFormId()){ // 标准装置申请 - /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; - case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; - case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; - case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; - case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/ + case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL:updateStandardState(id, EquipmentApplyProcessEnum.STANDARD_USE);break; + case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.STOP);break; + case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.REVOKE);break; // 设备状态管理申请 case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break; case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break; @@ -82,6 +80,12 @@ } } - private void updateStandardState(String businessKey,String state) { + private void updateStandardState(String id,String state) { + MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.in("id",id).set("manager_state",state); + if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } } } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java index 385406c..9b49201 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/EquipmentApplyProcessEnum.java @@ -21,6 +21,12 @@ String SCRAP = "4"; // 处置 String MANAGEMENT = "5"; + // 标准装置-在用 + String STANDARD_USE = "1"; + // 处置 + String STOP = "2"; + // 处置 + String REVOKE = "3"; } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java index 9d2e1c7..e7c492b 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/listeners/flowable/ProcessUpdateStateListener.java @@ -41,11 +41,9 @@ String id = execution.getProcessInstanceBusinessKey(); switch (systemFlowForm.getFormId()){ // 标准装置申请 - /* case ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL:updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; - case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; - case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; - case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break; - case ApplyFromIdEnum.STANDARD_CHECK_APPROVAL: updateStandardState(id, MeasureStatusEnum.MEASURE_COMPLETE);break;*/ + case ApplyFromIdEnum.STANDARD_REVERT_APPROVAL:updateStandardState(id, EquipmentApplyProcessEnum.STANDARD_USE);break; + case ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.STOP);break; + case ApplyFromIdEnum.STANDARD_RESUME_APPROVAL: updateStandardState(id, EquipmentApplyProcessEnum.REVOKE);break; // 设备状态管理申请 case ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.IDLE);break; case ApplyFromIdEnum.DEVICE_SEALED_APPROVAL: updateEquipmentState(id, EquipmentApplyProcessEnum.SEALED);break; @@ -82,6 +80,12 @@ } } - private void updateStandardState(String businessKey,String state) { + private void updateStandardState(String id,String state) { + MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.in("id",id).set("manager_state",state); + if(meterFixedAssetsMapper.update(null,updateWrapper)<=0){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } } } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml index 8cd70b9..4e6bf53 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStateManageMapper.xml @@ -18,8 +18,10 @@ mfa.model_no, mfa.manager_state, msa.approval_status, - sd.SIMPLE_NAME as apply_unit, - su.`NAME` as apply_person, + msa.apply_unit, + sd.SIMPLE_NAME as apply_unit_name, + su.`NAME` as apply_person_name, + msa.apply_person, DATE_FORMAT( msa.time, '%Y-%m-%d %H:%i' ) as time, mfa.equipment_specifications, mfa.manufacturing_no, @@ -70,6 +72,12 @@ #{id} + + and msa.id in + + #{id} + + ORDER BY msa.create_time DESC