fix(jg):维保作废

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgMaintenanceContractMapper.xml

@@ -38,6 +38,7 @@
         tjmc.create_user_id,
         tjmc.next_execute_user_ids,
         tjmc.next_task_id,
+        tjmc.cancel_reason,
         ri."EQU_CODE" as equCode,
         concat(date_format(IFNULL(inform_start, null),'%Y-%m-%d'),'  ~  ',date_format(IFNULL(inform_end, null),'%Y-%m-%d')) as  informStartAndEnd,
         (SELECT name from tz_equipment_category ec WHERE ec.code = ri.EQU_LIST) AS equList,

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgMaintenanceContractServiceImpl.java

@@ -746,34 +746,55 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
         return format;
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public JgMaintenanceContract cancelApplication(Long sequenceNbr, String cancelReason) {
         JgMaintenanceContract maintenanceContract = this.getById(sequenceNbr);
         // 1.更新为已作废
         String oldNoticeStatus = maintenanceContract.getStatus();
-        maintenanceContract.setApplyStatus(String.valueOf(FlowStatusEnum.TO_BE_DISCARD.getCode()));
+        maintenanceContract.setStatus(FlowStatusEnum.TO_BE_DISCARD.getName());
         maintenanceContract.setCancelReason(cancelReason);
         maintenanceContract.setCancelDate(new Date());
         maintenanceContract.setCancelUserId(RequestContext.getExeUserId());
         maintenanceContract.setNextExecuteUserIds(null);
         maintenanceContract.setPromoter(null);
         this.updateById(maintenanceContract);
-        this.processElseDataByStatus(Objects.requireNonNull(FlowStatusEnum.getEumByCode(Integer.parseInt(oldNoticeStatus))), maintenanceContract);
+        this.processElseDataByStatus(Objects.requireNonNull(this.confirmBusinessPhase(oldNoticeStatus)), maintenanceContract);
         return maintenanceContract;
     }
 
+    private FlowStatusEnum confirmBusinessPhase(String status) {
+        Set<String> toBeSubmittedSet = new HashSet<>(Arrays.asList(
+                WorkFlowStatusEnum.MAIN_SUBMIT.getPass(),
+                WorkFlowStatusEnum.MAIN_SUBMIT.getReject(),
+                WorkFlowStatusEnum.MAIN_SUBMIT.getRollBack(),
+                WorkFlowStatusEnum.MAIN_RECEIVE.getPass(),
+                WorkFlowStatusEnum.MAIN_RECEIVE.getReject(),
+                WorkFlowStatusEnum.MAIN_RECEIVE.getRollBack(),
+                WorkFlowStatusEnum.MAIN_PRELIMINARY.getPass()
+        ));
+
+        if (toBeSubmittedSet.contains(status)) {
+            return FlowStatusEnum.TO_BE_SUBMITTED;
+        }
+
+        if (FlowStatusEnum.TO_BE_FINISHED.getName().equals(status)) {
+            return FlowStatusEnum.TO_BE_FINISHED;
+        }
+
+        return null;
+    }
+
     private void processElseDataByStatus(FlowStatusEnum oldNoticeStatus, JgMaintenanceContract maintenanceContract) {
         switch (oldNoticeStatus) {
-            case TO_BE_SUBMITTED: // 待提交
+            case TO_BE_SUBMITTED:
                 // 1.写入历史表
                 this.saveHisDataBeforeUpdate(maintenanceContract);
                 // 2.删除暂存时生成的待办
-                commonService.deleteTasksByRelationId(maintenanceContract.getSequenceNbr() + "");
+                commonService.deleteTasksAndStopProcess(maintenanceContract.getInstanceId(),"监管单位主动作废");
                 break;
-            case TO_BE_FINISHED: // 已完成
+            case TO_BE_FINISHED:
                 // 1.回退表单
                 updateIdxBizJgRegisterInfo(maintenanceContract);
-                // 2.清空redis 缓存的流程中及已完成安装告知的设备
-//                this.delRepeatUseEquipData(maintenanceContract);
                 break;
             default:
                 // 流程中（驳回、撤回等）
@@ -783,11 +804,11 @@ public class JgMaintenanceContractServiceImpl extends BaseService<JgMaintenanceC
                 iCmWorkflowService.stopProcess(maintenanceContract.getInstanceId(), maintenanceContract.getCancelReason());
                 // 3.写入历史表
                 this.saveHisDataBeforeUpdate(maintenanceContract);
-                // 4.清空redis（缓存的流程中及已完成安装告知的设备）
-//                this.delRepeatUseEquipData(maintenanceContract);
         }
     }
 
+
+
     private void updateIdxBizJgRegisterInfo(JgMaintenanceContract maintenanceContract) {
         LambdaQueryWrapper<JgMaintenanceContractEq> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(JgMaintenanceContractEq::getEquipTransferId, maintenanceContract.getSequenceNbr());