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

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

Browse Source
This commit was merged in pull request #31.
This commit is contained in:
qtz
2024-01-20 17:10:05 +08:00
committed by Gitea
parent 4076086a75 79afb35549
commit f2f47a6aa8
1 changed files with 39 additions and 16 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
+27 -4
View File
@@ -607,10 +607,22 @@ 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());
@@ -618,11 +630,23 @@ public class MsSignSealServiceImpl implements MsSignSealService {
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());
@@ -630,7 +654,6 @@ public class MsSignSealServiceImpl implements MsSignSealService {
caseApplicationMapper.updateByPrimaryKeySelective(caseApplicationselect);
CaseLogUtils.insertCaseLog(caseApplicationselect.getId(), nextFlow.getNodeId(), nextFlow.getCaseStatusName(),"签收");
}
}
return AjaxResult.success("签收成功");