From 31b6e6a4beff543bc33a2cb9e3e47a8479897cc2 Mon Sep 17 00:00:00 2001 From: qitz <18810291185@163.com> Date: Sat, 20 Jan 2024 17:05:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=AD=BE=E6=94=B6=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mscase/impl/MsSignSealServiceImpl.java | 55 +++++++++++++------ 1 file changed, 39 insertions(+), 16 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java index 62bddcf..97e9ea9 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java @@ -607,29 +607,52 @@ public class MsSignSealServiceImpl implements MsSignSealService { Long caseId = dto.getCaseId(); MsCaseAffiliate caseAffiliate = msCaseAffiliateMapper.selectByPrimaryKey(caseId); MsCaseApplication caseApplicationselect = msCaseApplicationMapper.selectByPrimaryKey(caseId); +// if (dto.getIsSignApply() != null && dto.getIsSignApply().intValue() == 1) { +// caseAffiliate.setIsSignApply(1); +// msCaseAffiliateMapper.updateByPrimaryKeySelective(caseAffiliate); +// if (caseAffiliate.getIsSignRespon() != null && caseAffiliate.getIsSignRespon().intValue() == 1) { +// // 根据流程id查找下一个流程节点 +// MsCaseFlow nextFlow = caseFlowMapper.nextFlow(caseApplicationselect.getCaseFlowId()); +// caseApplicationselect.setCaseFlowId(nextFlow.getId()); +// caseApplicationselect.setCaseStatusName(nextFlow.getCaseStatusName()); +// caseApplicationMapper.updateByPrimaryKeySelective(caseApplicationselect); +// CaseLogUtils.insertCaseLog(caseApplicationselect.getId(), nextFlow.getNodeId(), nextFlow.getCaseStatusName(),"签收"); +// } +// } if (dto.getIsSignApply() != null && dto.getIsSignApply().intValue() == 1) { caseAffiliate.setIsSignApply(1); msCaseAffiliateMapper.updateByPrimaryKeySelective(caseAffiliate); - if (caseAffiliate.getIsSignRespon() != null && caseAffiliate.getIsSignRespon().intValue() == 1) { - // 根据流程id查找下一个流程节点 - MsCaseFlow nextFlow = caseFlowMapper.nextFlow(caseApplicationselect.getCaseFlowId()); - caseApplicationselect.setCaseFlowId(nextFlow.getId()); - caseApplicationselect.setCaseStatusName(nextFlow.getCaseStatusName()); - caseApplicationMapper.updateByPrimaryKeySelective(caseApplicationselect); - CaseLogUtils.insertCaseLog(caseApplicationselect.getId(), nextFlow.getNodeId(), nextFlow.getCaseStatusName(),"签收"); - } + + // 根据流程id查找下一个流程节点 + MsCaseFlow nextFlow = caseFlowMapper.nextFlow(caseApplicationselect.getCaseFlowId()); + caseApplicationselect.setCaseFlowId(nextFlow.getId()); + caseApplicationselect.setCaseStatusName(nextFlow.getCaseStatusName()); + caseApplicationMapper.updateByPrimaryKeySelective(caseApplicationselect); + CaseLogUtils.insertCaseLog(caseApplicationselect.getId(), nextFlow.getNodeId(), nextFlow.getCaseStatusName(),"签收"); } +// if (dto.getIsSignRespon() != null && dto.getIsSignRespon().intValue() == 1) { +// caseAffiliate.setIsSignRespon(1); +// msCaseAffiliateMapper.updateByPrimaryKeySelective(caseAffiliate); +// if (caseAffiliate.getIsSignApply() != null && caseAffiliate.getIsSignApply().intValue() == 1) { +// // 根据流程id查找下一个流程节点 +// MsCaseFlow nextFlow = caseFlowMapper.nextFlow(caseApplicationselect.getCaseFlowId()); +// caseApplicationselect.setCaseFlowId(nextFlow.getId()); +// caseApplicationselect.setCaseStatusName(nextFlow.getCaseStatusName()); +// caseApplicationMapper.updateByPrimaryKeySelective(caseApplicationselect); +// CaseLogUtils.insertCaseLog(caseApplicationselect.getId(), nextFlow.getNodeId(), nextFlow.getCaseStatusName(),"签收"); +// } +// } + if (dto.getIsSignRespon() != null && dto.getIsSignRespon().intValue() == 1) { caseAffiliate.setIsSignRespon(1); msCaseAffiliateMapper.updateByPrimaryKeySelective(caseAffiliate); - if (caseAffiliate.getIsSignApply() != null && caseAffiliate.getIsSignApply().intValue() == 1) { - // 根据流程id查找下一个流程节点 - MsCaseFlow nextFlow = caseFlowMapper.nextFlow(caseApplicationselect.getCaseFlowId()); - caseApplicationselect.setCaseFlowId(nextFlow.getId()); - caseApplicationselect.setCaseStatusName(nextFlow.getCaseStatusName()); - caseApplicationMapper.updateByPrimaryKeySelective(caseApplicationselect); - CaseLogUtils.insertCaseLog(caseApplicationselect.getId(), nextFlow.getNodeId(), nextFlow.getCaseStatusName(),"签收"); - } + + // 根据流程id查找下一个流程节点 + MsCaseFlow nextFlow = caseFlowMapper.nextFlow(caseApplicationselect.getCaseFlowId()); + caseApplicationselect.setCaseFlowId(nextFlow.getId()); + caseApplicationselect.setCaseStatusName(nextFlow.getCaseStatusName()); + caseApplicationMapper.updateByPrimaryKeySelective(caseApplicationselect); + CaseLogUtils.insertCaseLog(caseApplicationselect.getId(), nextFlow.getNodeId(), nextFlow.getCaseStatusName(),"签收"); } return AjaxResult.success("签收成功"); -- 2.54.0