소스 검색

修改签收功能

qitz 2 년 전
부모
커밋
9fe2684b33
1개의 변경된 파일7개의 추가작업 그리고 2개의 파일을 삭제
  1. 7
    2
      ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java

+ 7
- 2
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java 파일 보기

@@ -723,6 +723,11 @@ public class MsSignSealServiceImpl implements MsSignSealService {
723 723
         Long caseId = dto.getCaseId();
724 724
         MsCaseAffiliate caseAffiliate = msCaseAffiliateMapper.selectByPrimaryKey(caseId);
725 725
         MsCaseApplication caseApplicationselect = msCaseApplicationMapper.selectByPrimaryKey(caseId);
726
+        // 查询当前节点
727
+        MsCaseFlow currentFlow = caseFlowMapper.selectByPrimaryKey(caseApplicationselect.getCaseFlowId());
728
+        if (currentFlow == null) {
729
+            return AjaxResult.error("当前流程不存在");
730
+        }
726 731
 //        if (dto.getIsSignApply() != null && dto.getIsSignApply().intValue() == 1) {
727 732
 //            caseAffiliate.setIsSignApply(1);
728 733
 //            msCaseAffiliateMapper.updateByPrimaryKeySelective(caseAffiliate);
@@ -744,7 +749,7 @@ public class MsSignSealServiceImpl implements MsSignSealService {
744 749
             caseApplicationselect.setCaseFlowId(nextFlow.getId());
745 750
             caseApplicationselect.setCaseStatusName(nextFlow.getCaseStatusName());
746 751
             caseApplicationMapper.updateByPrimaryKeySelective(caseApplicationselect);
747
-            CaseLogUtils.insertCaseLog(caseApplicationselect.getId(), nextFlow.getNodeId(), nextFlow.getCaseStatusName(),"签收");
752
+            CaseLogUtils.insertCaseLog(caseApplicationselect.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(),"签收");
748 753
         }
749 754
 //        if (dto.getIsSignRespon() != null && dto.getIsSignRespon().intValue() == 1) {
750 755
 //            caseAffiliate.setIsSignRespon(1);
@@ -768,7 +773,7 @@ public class MsSignSealServiceImpl implements MsSignSealService {
768 773
             caseApplicationselect.setCaseFlowId(nextFlow.getId());
769 774
             caseApplicationselect.setCaseStatusName(nextFlow.getCaseStatusName());
770 775
             caseApplicationMapper.updateByPrimaryKeySelective(caseApplicationselect);
771
-            CaseLogUtils.insertCaseLog(caseApplicationselect.getId(), nextFlow.getNodeId(), nextFlow.getCaseStatusName(),"签收");
776
+            CaseLogUtils.insertCaseLog(caseApplicationselect.getId(), currentFlow.getNodeId(), currentFlow.getCaseStatusName(),"签收");
772 777
         }
773 778
 
774 779
         return AjaxResult.success("签收成功");