diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index 8c3d580..90e9d87 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -27,7 +27,7 @@ put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE); put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP); put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL.getCode(), EQUIPMENT_APPLY_REVOKE); - put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS); + put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS); //标准装置更换申请 put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode(), DEVICE_MANAGING_IDLE); put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode(), DEVICE_MANAGING_SEALED); put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL.getCode(), DEVICE_MANAGING_USE); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index 8c3d580..90e9d87 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -27,7 +27,7 @@ put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE); put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP); put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL.getCode(), EQUIPMENT_APPLY_REVOKE); - put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS); + put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS); //标准装置更换申请 put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode(), DEVICE_MANAGING_IDLE); put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode(), DEVICE_MANAGING_SEALED); put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL.getCode(), DEVICE_MANAGING_USE); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java index 1426e84..fccbaf5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java @@ -1,5 +1,6 @@ package com.casic.missiles.mapper.equipment; +import com.casic.missiles.model.equipment.EquipmentStandardApplyEquipment; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -17,4 +18,6 @@ public interface EquipmentStandardSupportMapper extends BaseMapper { List selectBatchEquipmentIds(@Param("supportEquipmentIds") List supportEquipmentIds); + + int deleteByList(@Param("equipmentStandardApplyEquipments") List equipmentStandardApplyEquipments, @Param("standardEquipmentId") String standardEquipmentId); } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index 8c3d580..90e9d87 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -27,7 +27,7 @@ put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE); put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP); put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL.getCode(), EQUIPMENT_APPLY_REVOKE); - put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS); + put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS); //标准装置更换申请 put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode(), DEVICE_MANAGING_IDLE); put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode(), DEVICE_MANAGING_SEALED); put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL.getCode(), DEVICE_MANAGING_USE); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java index 1426e84..fccbaf5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java @@ -1,5 +1,6 @@ package com.casic.missiles.mapper.equipment; +import com.casic.missiles.model.equipment.EquipmentStandardApplyEquipment; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -17,4 +18,6 @@ public interface EquipmentStandardSupportMapper extends BaseMapper { List selectBatchEquipmentIds(@Param("supportEquipmentIds") List supportEquipmentIds); + + int deleteByList(@Param("equipmentStandardApplyEquipments") List equipmentStandardApplyEquipments, @Param("standardEquipmentId") String standardEquipmentId); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml index b7e9906..cd20d88 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml @@ -19,7 +19,8 @@ msa.apply_desc, msa.process_id, msa.process_result, - msa.remark + msa.remark, + msa.back_time FROM equipment_apply msa LEFT JOIN sys_user su ON su.id = msa.apply_person @@ -89,7 +90,8 @@ msa.apply_desc, msa.process_id, msa.process_result, - msa.remark + msa.remark, + msa.back_time FROM equipment_apply msa LEFT JOIN sys_user su ON msa.apply_person = su.id diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index 8c3d580..90e9d87 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -27,7 +27,7 @@ put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE); put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP); put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL.getCode(), EQUIPMENT_APPLY_REVOKE); - put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS); + put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS); //标准装置更换申请 put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode(), DEVICE_MANAGING_IDLE); put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode(), DEVICE_MANAGING_SEALED); put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL.getCode(), DEVICE_MANAGING_USE); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java index 1426e84..fccbaf5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java @@ -1,5 +1,6 @@ package com.casic.missiles.mapper.equipment; +import com.casic.missiles.model.equipment.EquipmentStandardApplyEquipment; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -17,4 +18,6 @@ public interface EquipmentStandardSupportMapper extends BaseMapper { List selectBatchEquipmentIds(@Param("supportEquipmentIds") List supportEquipmentIds); + + int deleteByList(@Param("equipmentStandardApplyEquipments") List equipmentStandardApplyEquipments, @Param("standardEquipmentId") String standardEquipmentId); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml index b7e9906..cd20d88 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml @@ -19,7 +19,8 @@ msa.apply_desc, msa.process_id, msa.process_result, - msa.remark + msa.remark, + msa.back_time FROM equipment_apply msa LEFT JOIN sys_user su ON su.id = msa.apply_person @@ -89,7 +90,8 @@ msa.apply_desc, msa.process_id, msa.process_result, - msa.remark + msa.remark, + msa.back_time FROM equipment_apply msa LEFT JOIN sys_user su ON msa.apply_person = su.id diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml index 858b2e5..4eedb83 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml @@ -26,4 +26,14 @@ #{item} + + + DELETE FROM equipment_standard_support_equipment + WHERE is_del = 0 + AND standard_equipment_id = #{standardEquipmentId} + AND equipment_id IN + + #{item.supportEquipmentId} + + diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index 8c3d580..90e9d87 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -27,7 +27,7 @@ put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE); put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP); put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL.getCode(), EQUIPMENT_APPLY_REVOKE); - put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS); + put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS); //标准装置更换申请 put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode(), DEVICE_MANAGING_IDLE); put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode(), DEVICE_MANAGING_SEALED); put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL.getCode(), DEVICE_MANAGING_USE); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java index 1426e84..fccbaf5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java @@ -1,5 +1,6 @@ package com.casic.missiles.mapper.equipment; +import com.casic.missiles.model.equipment.EquipmentStandardApplyEquipment; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -17,4 +18,6 @@ public interface EquipmentStandardSupportMapper extends BaseMapper { List selectBatchEquipmentIds(@Param("supportEquipmentIds") List supportEquipmentIds); + + int deleteByList(@Param("equipmentStandardApplyEquipments") List equipmentStandardApplyEquipments, @Param("standardEquipmentId") String standardEquipmentId); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml index b7e9906..cd20d88 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml @@ -19,7 +19,8 @@ msa.apply_desc, msa.process_id, msa.process_result, - msa.remark + msa.remark, + msa.back_time FROM equipment_apply msa LEFT JOIN sys_user su ON su.id = msa.apply_person @@ -89,7 +90,8 @@ msa.apply_desc, msa.process_id, msa.process_result, - msa.remark + msa.remark, + msa.back_time FROM equipment_apply msa LEFT JOIN sys_user su ON msa.apply_person = su.id diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml index 858b2e5..4eedb83 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml @@ -26,4 +26,14 @@ #{item} + + + DELETE FROM equipment_standard_support_equipment + WHERE is_del = 0 + AND standard_equipment_id = #{standardEquipmentId} + AND equipment_id IN + + #{item.supportEquipmentId} + + diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 26dded8..1ed318c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -241,6 +241,9 @@ for (Task task : tasks) { HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery() .processInstanceId(task.getProcessInstanceId()).singleResult(); + if(ApprovalStatusEnum.CANCELED.equals(historicProcessInstance.getBusinessStatus())){ + continue; + } //任务id，用户进行任务审批使用 ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index 8c3d580..90e9d87 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -27,7 +27,7 @@ put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE); put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP); put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL.getCode(), EQUIPMENT_APPLY_REVOKE); - put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS); + put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS); //标准装置更换申请 put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode(), DEVICE_MANAGING_IDLE); put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode(), DEVICE_MANAGING_SEALED); put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL.getCode(), DEVICE_MANAGING_USE); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java index 1426e84..fccbaf5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java @@ -1,5 +1,6 @@ package com.casic.missiles.mapper.equipment; +import com.casic.missiles.model.equipment.EquipmentStandardApplyEquipment; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -17,4 +18,6 @@ public interface EquipmentStandardSupportMapper extends BaseMapper { List selectBatchEquipmentIds(@Param("supportEquipmentIds") List supportEquipmentIds); + + int deleteByList(@Param("equipmentStandardApplyEquipments") List equipmentStandardApplyEquipments, @Param("standardEquipmentId") String standardEquipmentId); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml index b7e9906..cd20d88 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml @@ -19,7 +19,8 @@ msa.apply_desc, msa.process_id, msa.process_result, - msa.remark + msa.remark, + msa.back_time FROM equipment_apply msa LEFT JOIN sys_user su ON su.id = msa.apply_person @@ -89,7 +90,8 @@ msa.apply_desc, msa.process_id, msa.process_result, - msa.remark + msa.remark, + msa.back_time FROM equipment_apply msa LEFT JOIN sys_user su ON msa.apply_person = su.id diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml index 858b2e5..4eedb83 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml @@ -26,4 +26,14 @@ #{item} + + + DELETE FROM equipment_standard_support_equipment + WHERE is_del = 0 + AND standard_equipment_id = #{standardEquipmentId} + AND equipment_id IN + + #{item.supportEquipmentId} + + diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 26dded8..1ed318c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -241,6 +241,9 @@ for (Task task : tasks) { HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery() .processInstanceId(task.getProcessInstanceId()).singleResult(); + if(ApprovalStatusEnum.CANCELED.equals(historicProcessInstance.getBusinessStatus())){ + continue; + } //任务id，用户进行任务审批使用 ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java index d8a027a..a2f70c8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java @@ -14,6 +14,7 @@ import com.casic.missiles.mapper.MeterFixedAssetsMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardSupportMapper; import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.equipment.EquipmentStandardApplyEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.casic.missiles.model.page.PageQuery; @@ -143,6 +144,11 @@ return ReturnUtil.success(); } + @Override + public int deleteByList(List equipmentStandardApplyEquipments, String standardEquipmentId) { + return meterStandardSupportEquipmentMapper.deleteByList(equipmentStandardApplyEquipments, standardEquipmentId); + } + /** * 信息校验 * @param meterStandardSupportEquipment diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index 8c3d580..90e9d87 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -27,7 +27,7 @@ put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE); put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP); put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL.getCode(), EQUIPMENT_APPLY_REVOKE); - put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS); + put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS); //标准装置更换申请 put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode(), DEVICE_MANAGING_IDLE); put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode(), DEVICE_MANAGING_SEALED); put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL.getCode(), DEVICE_MANAGING_USE); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java index 1426e84..fccbaf5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java @@ -1,5 +1,6 @@ package com.casic.missiles.mapper.equipment; +import com.casic.missiles.model.equipment.EquipmentStandardApplyEquipment; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -17,4 +18,6 @@ public interface EquipmentStandardSupportMapper extends BaseMapper { List selectBatchEquipmentIds(@Param("supportEquipmentIds") List supportEquipmentIds); + + int deleteByList(@Param("equipmentStandardApplyEquipments") List equipmentStandardApplyEquipments, @Param("standardEquipmentId") String standardEquipmentId); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml index b7e9906..cd20d88 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml @@ -19,7 +19,8 @@ msa.apply_desc, msa.process_id, msa.process_result, - msa.remark + msa.remark, + msa.back_time FROM equipment_apply msa LEFT JOIN sys_user su ON su.id = msa.apply_person @@ -89,7 +90,8 @@ msa.apply_desc, msa.process_id, msa.process_result, - msa.remark + msa.remark, + msa.back_time FROM equipment_apply msa LEFT JOIN sys_user su ON msa.apply_person = su.id diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml index 858b2e5..4eedb83 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml @@ -26,4 +26,14 @@ #{item} + + + DELETE FROM equipment_standard_support_equipment + WHERE is_del = 0 + AND standard_equipment_id = #{standardEquipmentId} + AND equipment_id IN + + #{item.supportEquipmentId} + + diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 26dded8..1ed318c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -241,6 +241,9 @@ for (Task task : tasks) { HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery() .processInstanceId(task.getProcessInstanceId()).singleResult(); + if(ApprovalStatusEnum.CANCELED.equals(historicProcessInstance.getBusinessStatus())){ + continue; + } //任务id，用户进行任务审批使用 ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java index d8a027a..a2f70c8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java @@ -14,6 +14,7 @@ import com.casic.missiles.mapper.MeterFixedAssetsMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardSupportMapper; import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.equipment.EquipmentStandardApplyEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.casic.missiles.model.page.PageQuery; @@ -143,6 +144,11 @@ return ReturnUtil.success(); } + @Override + public int deleteByList(List equipmentStandardApplyEquipments, String standardEquipmentId) { + return meterStandardSupportEquipmentMapper.deleteByList(equipmentStandardApplyEquipments, standardEquipmentId); + } + /** * 信息校验 * @param meterStandardSupportEquipment diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java index 4d2512e..8c87429 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java @@ -23,7 +23,9 @@ import com.casic.missiles.model.equipment.EquipmentApply; import com.casic.missiles.model.equipment.EquipmentApplyEquipment; import com.casic.missiles.model.equipment.EquipmentApplyFile; +import com.casic.missiles.model.equipment.EquipmentStandardEquipmentFile; import com.casic.missiles.service.IBaseApprovalService; +import com.casic.missiles.service.equipment.IEquipmentApplyFileService; import com.casic.missiles.service.equipment.IEquipmentStateManageService; import com.casic.missiles.utils.DictCodeUtils; import org.springframework.beans.BeanUtils; @@ -49,6 +51,9 @@ private EquipmentApplyFileMapper equipmentApplyFileMapper; @Resource + private IEquipmentApplyFileService applyFileService; + + @Resource private IBaseExportService iBaseExportService; @Resource @@ -165,6 +170,18 @@ BeanUtils.copyProperties(response, equipmentApply); if(equipmentApplyMapper.updateById(equipmentApply)>0){ EquipmentApplyEquipment equipment = new EquipmentApplyEquipment(response.getApplyEquipmentId(),response.getEquipmentId(),response.getFinancialValue(),response.getAssetOriginValue()); + // 删除老的文件，更新新的文件 + if (!CollectionUtils.isEmpty(response.getFileList())) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("apply_id", response.getId()); + equipmentApplyFileMapper.delete(wrapper); + for (EquipmentApplyFile file : response.getFileList()) { + file.setApplyId(response.getId()); + } + if(!applyFileService.saveBatch(response.getFileList())){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } if(equipmentMapper.updateById(equipment)>0)return ReturnUtil.success(); throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index 8c3d580..90e9d87 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -27,7 +27,7 @@ put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE); put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP); put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL.getCode(), EQUIPMENT_APPLY_REVOKE); - put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS); + put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS); //标准装置更换申请 put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode(), DEVICE_MANAGING_IDLE); put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode(), DEVICE_MANAGING_SEALED); put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL.getCode(), DEVICE_MANAGING_USE); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java index 1426e84..fccbaf5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java @@ -1,5 +1,6 @@ package com.casic.missiles.mapper.equipment; +import com.casic.missiles.model.equipment.EquipmentStandardApplyEquipment; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -17,4 +18,6 @@ public interface EquipmentStandardSupportMapper extends BaseMapper { List selectBatchEquipmentIds(@Param("supportEquipmentIds") List supportEquipmentIds); + + int deleteByList(@Param("equipmentStandardApplyEquipments") List equipmentStandardApplyEquipments, @Param("standardEquipmentId") String standardEquipmentId); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml index b7e9906..cd20d88 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml @@ -19,7 +19,8 @@ msa.apply_desc, msa.process_id, msa.process_result, - msa.remark + msa.remark, + msa.back_time FROM equipment_apply msa LEFT JOIN sys_user su ON su.id = msa.apply_person @@ -89,7 +90,8 @@ msa.apply_desc, msa.process_id, msa.process_result, - msa.remark + msa.remark, + msa.back_time FROM equipment_apply msa LEFT JOIN sys_user su ON msa.apply_person = su.id diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml index 858b2e5..4eedb83 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml @@ -26,4 +26,14 @@ #{item} + + + DELETE FROM equipment_standard_support_equipment + WHERE is_del = 0 + AND standard_equipment_id = #{standardEquipmentId} + AND equipment_id IN + + #{item.supportEquipmentId} + + diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 26dded8..1ed318c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -241,6 +241,9 @@ for (Task task : tasks) { HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery() .processInstanceId(task.getProcessInstanceId()).singleResult(); + if(ApprovalStatusEnum.CANCELED.equals(historicProcessInstance.getBusinessStatus())){ + continue; + } //任务id，用户进行任务审批使用 ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java index d8a027a..a2f70c8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java @@ -14,6 +14,7 @@ import com.casic.missiles.mapper.MeterFixedAssetsMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardSupportMapper; import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.equipment.EquipmentStandardApplyEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.casic.missiles.model.page.PageQuery; @@ -143,6 +144,11 @@ return ReturnUtil.success(); } + @Override + public int deleteByList(List equipmentStandardApplyEquipments, String standardEquipmentId) { + return meterStandardSupportEquipmentMapper.deleteByList(equipmentStandardApplyEquipments, standardEquipmentId); + } + /** * 信息校验 * @param meterStandardSupportEquipment diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java index 4d2512e..8c87429 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java @@ -23,7 +23,9 @@ import com.casic.missiles.model.equipment.EquipmentApply; import com.casic.missiles.model.equipment.EquipmentApplyEquipment; import com.casic.missiles.model.equipment.EquipmentApplyFile; +import com.casic.missiles.model.equipment.EquipmentStandardEquipmentFile; import com.casic.missiles.service.IBaseApprovalService; +import com.casic.missiles.service.equipment.IEquipmentApplyFileService; import com.casic.missiles.service.equipment.IEquipmentStateManageService; import com.casic.missiles.utils.DictCodeUtils; import org.springframework.beans.BeanUtils; @@ -49,6 +51,9 @@ private EquipmentApplyFileMapper equipmentApplyFileMapper; @Resource + private IEquipmentApplyFileService applyFileService; + + @Resource private IBaseExportService iBaseExportService; @Resource @@ -165,6 +170,18 @@ BeanUtils.copyProperties(response, equipmentApply); if(equipmentApplyMapper.updateById(equipmentApply)>0){ EquipmentApplyEquipment equipment = new EquipmentApplyEquipment(response.getApplyEquipmentId(),response.getEquipmentId(),response.getFinancialValue(),response.getAssetOriginValue()); + // 删除老的文件，更新新的文件 + if (!CollectionUtils.isEmpty(response.getFileList())) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("apply_id", response.getId()); + equipmentApplyFileMapper.delete(wrapper); + for (EquipmentApplyFile file : response.getFileList()) { + file.setApplyId(response.getId()); + } + if(!applyFileService.saveBatch(response.getFileList())){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } if(equipmentMapper.updateById(equipment)>0)return ReturnUtil.success(); throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentStandardSupportEquipmentService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentStandardSupportEquipmentService.java index a7a04b3..fb0e9df 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentStandardSupportEquipmentService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentStandardSupportEquipmentService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.model.equipment.EquipmentStandardApplyEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; @@ -27,4 +28,5 @@ ReturnDTO batchDelete(List ids); + int deleteByList(List equipmentStandardApplyEquipments, String standardEquipmentId); } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index 8c3d580..90e9d87 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -27,7 +27,7 @@ put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE); put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP); put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL.getCode(), EQUIPMENT_APPLY_REVOKE); - put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS); + put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS); //标准装置更换申请 put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode(), DEVICE_MANAGING_IDLE); put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode(), DEVICE_MANAGING_SEALED); put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL.getCode(), DEVICE_MANAGING_USE); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java index 1426e84..fccbaf5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java @@ -1,5 +1,6 @@ package com.casic.missiles.mapper.equipment; +import com.casic.missiles.model.equipment.EquipmentStandardApplyEquipment; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -17,4 +18,6 @@ public interface EquipmentStandardSupportMapper extends BaseMapper { List selectBatchEquipmentIds(@Param("supportEquipmentIds") List supportEquipmentIds); + + int deleteByList(@Param("equipmentStandardApplyEquipments") List equipmentStandardApplyEquipments, @Param("standardEquipmentId") String standardEquipmentId); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml index b7e9906..cd20d88 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml @@ -19,7 +19,8 @@ msa.apply_desc, msa.process_id, msa.process_result, - msa.remark + msa.remark, + msa.back_time FROM equipment_apply msa LEFT JOIN sys_user su ON su.id = msa.apply_person @@ -89,7 +90,8 @@ msa.apply_desc, msa.process_id, msa.process_result, - msa.remark + msa.remark, + msa.back_time FROM equipment_apply msa LEFT JOIN sys_user su ON msa.apply_person = su.id diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml index 858b2e5..4eedb83 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml @@ -26,4 +26,14 @@ #{item} + + + DELETE FROM equipment_standard_support_equipment + WHERE is_del = 0 + AND standard_equipment_id = #{standardEquipmentId} + AND equipment_id IN + + #{item.supportEquipmentId} + + diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 26dded8..1ed318c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -241,6 +241,9 @@ for (Task task : tasks) { HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery() .processInstanceId(task.getProcessInstanceId()).singleResult(); + if(ApprovalStatusEnum.CANCELED.equals(historicProcessInstance.getBusinessStatus())){ + continue; + } //任务id，用户进行任务审批使用 ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java index d8a027a..a2f70c8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java @@ -14,6 +14,7 @@ import com.casic.missiles.mapper.MeterFixedAssetsMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardSupportMapper; import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.equipment.EquipmentStandardApplyEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.casic.missiles.model.page.PageQuery; @@ -143,6 +144,11 @@ return ReturnUtil.success(); } + @Override + public int deleteByList(List equipmentStandardApplyEquipments, String standardEquipmentId) { + return meterStandardSupportEquipmentMapper.deleteByList(equipmentStandardApplyEquipments, standardEquipmentId); + } + /** * 信息校验 * @param meterStandardSupportEquipment diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java index 4d2512e..8c87429 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java @@ -23,7 +23,9 @@ import com.casic.missiles.model.equipment.EquipmentApply; import com.casic.missiles.model.equipment.EquipmentApplyEquipment; import com.casic.missiles.model.equipment.EquipmentApplyFile; +import com.casic.missiles.model.equipment.EquipmentStandardEquipmentFile; import com.casic.missiles.service.IBaseApprovalService; +import com.casic.missiles.service.equipment.IEquipmentApplyFileService; import com.casic.missiles.service.equipment.IEquipmentStateManageService; import com.casic.missiles.utils.DictCodeUtils; import org.springframework.beans.BeanUtils; @@ -49,6 +51,9 @@ private EquipmentApplyFileMapper equipmentApplyFileMapper; @Resource + private IEquipmentApplyFileService applyFileService; + + @Resource private IBaseExportService iBaseExportService; @Resource @@ -165,6 +170,18 @@ BeanUtils.copyProperties(response, equipmentApply); if(equipmentApplyMapper.updateById(equipmentApply)>0){ EquipmentApplyEquipment equipment = new EquipmentApplyEquipment(response.getApplyEquipmentId(),response.getEquipmentId(),response.getFinancialValue(),response.getAssetOriginValue()); + // 删除老的文件，更新新的文件 + if (!CollectionUtils.isEmpty(response.getFileList())) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("apply_id", response.getId()); + equipmentApplyFileMapper.delete(wrapper); + for (EquipmentApplyFile file : response.getFileList()) { + file.setApplyId(response.getId()); + } + if(!applyFileService.saveBatch(response.getFileList())){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } if(equipmentMapper.updateById(equipment)>0)return ReturnUtil.success(); throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentStandardSupportEquipmentService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentStandardSupportEquipmentService.java index a7a04b3..fb0e9df 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentStandardSupportEquipmentService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentStandardSupportEquipmentService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.model.equipment.EquipmentStandardApplyEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; @@ -27,4 +28,5 @@ ReturnDTO batchDelete(List ids); + int deleteByList(List equipmentStandardApplyEquipments, String standardEquipmentId); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/EquipmentManagingEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/EquipmentManagingEventPostProcessor.java index 99d28fb..502d307 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/EquipmentManagingEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/EquipmentManagingEventPostProcessor.java @@ -50,9 +50,7 @@ UpdateWrapper logUpdateWrapper = new UpdateWrapper<>(); // 修改状态变更记录结束时间 logUpdateWrapper.in("equipment_id", equipmentIds).isNull("end_date").set("end_date", DateUtils.format(new Date())); - if (stateChangeLogMapper.update(null, logUpdateWrapper) <= 0) { - throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); - } + stateChangeLogMapper.update(null, logUpdateWrapper); // 获取当前申请的信息 EquipmentApply equipmentApply = equipmentApplyMapper.selectById(id); // 新增状态变更记录 diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java index 8c3d580..90e9d87 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/notifyevent/AwareActionStatusEnum.java @@ -27,7 +27,7 @@ put(ApplyFromIdEnum.STANDARD_REVERT_APPROVAL.getCode(), EQUIPMENT_APPLY_USE); put(ApplyFromIdEnum.STANDARD_PAUSE_APPROVAL.getCode(), EQUIPMENT_APPLY_STOP); put(ApplyFromIdEnum.STANDARD_RESUME_APPROVAL.getCode(), EQUIPMENT_APPLY_REVOKE); - put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS); + put(ApplyFromIdEnum.STANDARD_CHANGE_APPROVAL.getCode(), EQUIPMENT_SUPPORT_STATUS); //标准装置更换申请 put(ApplyFromIdEnum.DEVICE_UNUSED_APPROVAL.getCode(), DEVICE_MANAGING_IDLE); put(ApplyFromIdEnum.DEVICE_SEALED_APPROVAL.getCode(), DEVICE_MANAGING_SEALED); put(ApplyFromIdEnum.DEVICE_UNSEALED_APPROVAL.getCode(), DEVICE_MANAGING_USE); diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java index 1426e84..fccbaf5 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/equipment/EquipmentStandardSupportMapper.java @@ -1,5 +1,6 @@ package com.casic.missiles.mapper.equipment; +import com.casic.missiles.model.equipment.EquipmentStandardApplyEquipment; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -17,4 +18,6 @@ public interface EquipmentStandardSupportMapper extends BaseMapper { List selectBatchEquipmentIds(@Param("supportEquipmentIds") List supportEquipmentIds); + + int deleteByList(@Param("equipmentStandardApplyEquipments") List equipmentStandardApplyEquipments, @Param("standardEquipmentId") String standardEquipmentId); } diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml index b7e9906..cd20d88 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentApplyMapper.xml @@ -19,7 +19,8 @@ msa.apply_desc, msa.process_id, msa.process_result, - msa.remark + msa.remark, + msa.back_time FROM equipment_apply msa LEFT JOIN sys_user su ON su.id = msa.apply_person @@ -89,7 +90,8 @@ msa.apply_desc, msa.process_id, msa.process_result, - msa.remark + msa.remark, + msa.back_time FROM equipment_apply msa LEFT JOIN sys_user su ON msa.apply_person = su.id diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml index 858b2e5..4eedb83 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentStandardSupportMapper.xml @@ -26,4 +26,14 @@ #{item} + + + DELETE FROM equipment_standard_support_equipment + WHERE is_del = 0 + AND standard_equipment_id = #{standardEquipmentId} + AND equipment_id IN + + #{item.supportEquipmentId} + + diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java index 26dded8..1ed318c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/BaseApprovalServiceImpl.java @@ -241,6 +241,9 @@ for (Task task : tasks) { HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery() .processInstanceId(task.getProcessInstanceId()).singleResult(); + if(ApprovalStatusEnum.CANCELED.equals(historicProcessInstance.getBusinessStatus())){ + continue; + } //任务id，用户进行任务审批使用 ToBeApprovedDTO toBeApprovedDTO = new ToBeApprovedDTO(); toBeApprovedDTO.setTaskId(task.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java index d8a027a..a2f70c8 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStandardSupportEquipmentServiceImpl.java @@ -14,6 +14,7 @@ import com.casic.missiles.mapper.MeterFixedAssetsMapper; import com.casic.missiles.mapper.equipment.EquipmentStandardSupportMapper; import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.model.equipment.EquipmentStandardApplyEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipment; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.casic.missiles.model.page.PageQuery; @@ -143,6 +144,11 @@ return ReturnUtil.success(); } + @Override + public int deleteByList(List equipmentStandardApplyEquipments, String standardEquipmentId) { + return meterStandardSupportEquipmentMapper.deleteByList(equipmentStandardApplyEquipments, standardEquipmentId); + } + /** * 信息校验 * @param meterStandardSupportEquipment diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java index 4d2512e..8c87429 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/equipment/EquipmentStateManageServiceImpl.java @@ -23,7 +23,9 @@ import com.casic.missiles.model.equipment.EquipmentApply; import com.casic.missiles.model.equipment.EquipmentApplyEquipment; import com.casic.missiles.model.equipment.EquipmentApplyFile; +import com.casic.missiles.model.equipment.EquipmentStandardEquipmentFile; import com.casic.missiles.service.IBaseApprovalService; +import com.casic.missiles.service.equipment.IEquipmentApplyFileService; import com.casic.missiles.service.equipment.IEquipmentStateManageService; import com.casic.missiles.utils.DictCodeUtils; import org.springframework.beans.BeanUtils; @@ -49,6 +51,9 @@ private EquipmentApplyFileMapper equipmentApplyFileMapper; @Resource + private IEquipmentApplyFileService applyFileService; + + @Resource private IBaseExportService iBaseExportService; @Resource @@ -165,6 +170,18 @@ BeanUtils.copyProperties(response, equipmentApply); if(equipmentApplyMapper.updateById(equipmentApply)>0){ EquipmentApplyEquipment equipment = new EquipmentApplyEquipment(response.getApplyEquipmentId(),response.getEquipmentId(),response.getFinancialValue(),response.getAssetOriginValue()); + // 删除老的文件，更新新的文件 + if (!CollectionUtils.isEmpty(response.getFileList())) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("apply_id", response.getId()); + equipmentApplyFileMapper.delete(wrapper); + for (EquipmentApplyFile file : response.getFileList()) { + file.setApplyId(response.getId()); + } + if(!applyFileService.saveBatch(response.getFileList())){ + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } if(equipmentMapper.updateById(equipment)>0)return ReturnUtil.success(); throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentStandardSupportEquipmentService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentStandardSupportEquipmentService.java index a7a04b3..fb0e9df 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentStandardSupportEquipmentService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/equipment/IEquipmentStandardSupportEquipmentService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.model.equipment.EquipmentStandardApplyEquipment; import com.casic.missiles.model.equipment.EquipmentStandardEquipmentUser; import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; @@ -27,4 +28,5 @@ ReturnDTO batchDelete(List ids); + int deleteByList(List equipmentStandardApplyEquipments, String standardEquipmentId); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/EquipmentManagingEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/EquipmentManagingEventPostProcessor.java index 99d28fb..502d307 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/EquipmentManagingEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/EquipmentManagingEventPostProcessor.java @@ -50,9 +50,7 @@ UpdateWrapper logUpdateWrapper = new UpdateWrapper<>(); // 修改状态变更记录结束时间 logUpdateWrapper.in("equipment_id", equipmentIds).isNull("end_date").set("end_date", DateUtils.format(new Date())); - if (stateChangeLogMapper.update(null, logUpdateWrapper) <= 0) { - throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); - } + stateChangeLogMapper.update(null, logUpdateWrapper); // 获取当前申请的信息 EquipmentApply equipmentApply = equipmentApplyMapper.selectById(id); // 新增状态变更记录 diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/EquipmentSupportEventPostProcessor.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/EquipmentSupportEventPostProcessor.java index 51897f0..a5b6a20 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/EquipmentSupportEventPostProcessor.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/processor/EquipmentSupportEventPostProcessor.java @@ -2,10 +2,13 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.casic.missiles.dto.flowable.NotifyEventStatusDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.notifyevent.ActionStatusBeanEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.MeterFixedAssetsMapper; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; import com.casic.missiles.service.equipment.IEquipmentStandardApplyEquipmentService; import com.casic.missiles.service.equipment.IEquipmentStandardSupportEquipmentService; import com.casic.missiles.service.listeners.NotifyEventPostProcessor; @@ -17,6 +20,7 @@ import com.casic.missiles.model.equipment.EquipmentStandardSupportEquipment; import com.casic.missiles.utils.SpringContextUtil; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.ArrayList; @@ -34,6 +38,7 @@ private IEquipmentStandardSupportEquipmentService supportEquipmentService; @Override + @Transactional public void doHandleNotifyEvent(NotifyEventStatusDTO notifyEventStatusDTO) { String id = notifyEventStatusDTO.getId(); EquipmentStandardApplyMapper standardApplyMapper = SpringContextUtil.getBean(EquipmentStandardApplyMapper.class); @@ -52,8 +57,20 @@ supportEquipment.setStandardEquipmentId(Long.valueOf(standardApply.getStandardEquipmentId())); supportEquipments.add(supportEquipment); } - // 没有删除配套设备的情况所以用saveOrUpdateBatch - if(!supportEquipmentService.saveOrUpdateBatch(supportEquipments)){ + + if(supportEquipmentService.saveOrUpdateBatch(supportEquipments)){ + //删除替换前的标准配套设备 + int deleteFlag = supportEquipmentService.deleteByList(equipmentStandardApplyEquipments, standardApply.getStandardEquipmentId()); + //将替换成的非标准配套设备的设备置为标准配套设备 + List equipmentIds = equipmentStandardApplyEquipments.stream().map(EquipmentStandardApplyEquipment::getEquipmentId).collect(Collectors.toList()); + MeterFixedAssetsMapper meterFixedAssetsMapper = SpringContextUtil.getBean(MeterFixedAssetsMapper.class); + // 修改对应设备为标准配套设备 + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + updateWrapper.in("id", equipmentIds).set("is_standard_support_equipment", 1); + if (deleteFlag <= 0 || meterFixedAssetsMapper.update(null, updateWrapper) <= 0) { + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } else{ throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } }