SH-Arbitrate/Mediation-Backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit was merged in pull request #93.
This commit is contained in:
qtz
2024-02-26 11:00:38 +08:00
committed by Gitea
parent d8cb453153 7ad9bdd869
commit da4a49956c
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java
+7 -6
View File
@@ -392,6 +392,11 @@ public class MsSignSealServiceImpl implements MsSignSealService {
if (nextFlow == null) { if (nextFlow == null) {
return AjaxResult.error("未找到下一个流程节点"); return AjaxResult.error("未找到下一个流程节点");
} }
// 查询当前节点
MsCaseFlow currentFlow = caseFlowMapper.selectByPrimaryKey(dto.getCaseFlowId());
if (currentFlow == null) {
return AjaxResult.error("当前流程不存在");
}
if (StrUtil.isNotEmpty(dto.getBatchNumber())) { if (StrUtil.isNotEmpty(dto.getBatchNumber())) {
// 批量操作 // 批量操作
// 查询该批号下该流程的案件 // 查询该批号下该流程的案件
@@ -403,9 +408,7 @@ public class MsSignSealServiceImpl implements MsSignSealService {
application.setCaseFlowId(nextFlow.getId()); application.setCaseFlowId(nextFlow.getId());
application.setCaseStatusName(nextFlow.getCaseStatusName()); application.setCaseStatusName(nextFlow.getCaseStatusName());
caseApplicationMapper.updateByPrimaryKeySelective(application); caseApplicationMapper.updateByPrimaryKeySelective(application);
CaseLogUtils.insertCaseLog(application.getId(), nextFlow.getNodeId(), nextFlow.getCaseStatusName(),"用印申请"); CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(),"用印申请");
} }
} else { } else {
// 单独 // 单独
@@ -415,9 +418,7 @@ public class MsSignSealServiceImpl implements MsSignSealService {
application.setCaseFlowId(nextFlow.getId()); application.setCaseFlowId(nextFlow.getId());
application.setCaseStatusName(nextFlow.getCaseStatusName()); application.setCaseStatusName(nextFlow.getCaseStatusName());
caseApplicationMapper.updateByPrimaryKeySelective(application); caseApplicationMapper.updateByPrimaryKeySelective(application);
CaseLogUtils.insertCaseLog(application.getId(), nextFlow.getNodeId(), nextFlow.getCaseStatusName(),"用印申请"); CaseLogUtils.insertCaseLog(application.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(),"用印申请");
} }
return AjaxResult.success("用印申请成功"); return AjaxResult.success("用印申请成功");