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("签收成功");