Quellcode durchsuchen

Merge branch 'qtz1' of SH-Arbitrate/Mediation-Backend into dev

qtz vor 2 Jahren
Ursprung
Commit
da4a49956c

+ 7
- 6
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java Datei anzeigen

392
         if (nextFlow == null) {
392
         if (nextFlow == null) {
393
             return AjaxResult.error("未找到下一个流程节点");
393
             return AjaxResult.error("未找到下一个流程节点");
394
         }
394
         }
395
+        // 查询当前节点
396
+        MsCaseFlow currentFlow = caseFlowMapper.selectByPrimaryKey(dto.getCaseFlowId());
397
+        if (currentFlow == null) {
398
+            return AjaxResult.error("当前流程不存在");
399
+        }
395
         if (StrUtil.isNotEmpty(dto.getBatchNumber())) {
400
         if (StrUtil.isNotEmpty(dto.getBatchNumber())) {
396
             // 批量操作
401
             // 批量操作
397
             // 查询该批号下该流程的案件
402
             // 查询该批号下该流程的案件
403
                 application.setCaseFlowId(nextFlow.getId());
408
                 application.setCaseFlowId(nextFlow.getId());
404
                 application.setCaseStatusName(nextFlow.getCaseStatusName());
409
                 application.setCaseStatusName(nextFlow.getCaseStatusName());
405
                 caseApplicationMapper.updateByPrimaryKeySelective(application);
410
                 caseApplicationMapper.updateByPrimaryKeySelective(application);
406
-                CaseLogUtils.insertCaseLog(application.getId(), nextFlow.getNodeId(), nextFlow.getCaseStatusName(),"用印申请");
407
-
408
-
411
+                CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(),"用印申请");
409
             }
412
             }
410
         } else {
413
         } else {
411
             // 单独
414
             // 单独
415
             application.setCaseFlowId(nextFlow.getId());
418
             application.setCaseFlowId(nextFlow.getId());
416
             application.setCaseStatusName(nextFlow.getCaseStatusName());
419
             application.setCaseStatusName(nextFlow.getCaseStatusName());
417
             caseApplicationMapper.updateByPrimaryKeySelective(application);
420
             caseApplicationMapper.updateByPrimaryKeySelective(application);
418
-            CaseLogUtils.insertCaseLog(application.getId(), nextFlow.getNodeId(), nextFlow.getCaseStatusName(),"用印申请");
419
-
420
-
421
+            CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(),"用印申请");
421
         }
422
         }
422
         return AjaxResult.success("用印申请成功");
423
         return AjaxResult.success("用印申请成功");
423
 
424