Procházet zdrojové kódy

修改签收功能

qitz před 2 roky
rodič
revize
9fe2684b33

+ 7
- 2
ruoyi-system/src/main/java/com/ruoyi/wisdomarbitrate/service/mscase/impl/MsSignSealServiceImpl.java Zobrazit soubor

723
         Long caseId = dto.getCaseId();
723
         Long caseId = dto.getCaseId();
724
         MsCaseAffiliate caseAffiliate = msCaseAffiliateMapper.selectByPrimaryKey(caseId);
724
         MsCaseAffiliate caseAffiliate = msCaseAffiliateMapper.selectByPrimaryKey(caseId);
725
         MsCaseApplication caseApplicationselect = msCaseApplicationMapper.selectByPrimaryKey(caseId);
725
         MsCaseApplication caseApplicationselect = msCaseApplicationMapper.selectByPrimaryKey(caseId);
726
+        // 查询当前节点
727
+        MsCaseFlow currentFlow = caseFlowMapper.selectByPrimaryKey(caseApplicationselect.getCaseFlowId());
728
+        if (currentFlow == null) {
729
+            return AjaxResult.error("当前流程不存在");
730
+        }
726
 //        if (dto.getIsSignApply() != null && dto.getIsSignApply().intValue() == 1) {
731
 //        if (dto.getIsSignApply() != null && dto.getIsSignApply().intValue() == 1) {
727
 //            caseAffiliate.setIsSignApply(1);
732
 //            caseAffiliate.setIsSignApply(1);
728
 //            msCaseAffiliateMapper.updateByPrimaryKeySelective(caseAffiliate);
733
 //            msCaseAffiliateMapper.updateByPrimaryKeySelective(caseAffiliate);
744
             caseApplicationselect.setCaseFlowId(nextFlow.getId());
749
             caseApplicationselect.setCaseFlowId(nextFlow.getId());
745
             caseApplicationselect.setCaseStatusName(nextFlow.getCaseStatusName());
750
             caseApplicationselect.setCaseStatusName(nextFlow.getCaseStatusName());
746
             caseApplicationMapper.updateByPrimaryKeySelective(caseApplicationselect);
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
 //        if (dto.getIsSignRespon() != null && dto.getIsSignRespon().intValue() == 1) {
754
 //        if (dto.getIsSignRespon() != null && dto.getIsSignRespon().intValue() == 1) {
750
 //            caseAffiliate.setIsSignRespon(1);
755
 //            caseAffiliate.setIsSignRespon(1);
768
             caseApplicationselect.setCaseFlowId(nextFlow.getId());
773
             caseApplicationselect.setCaseFlowId(nextFlow.getId());
769
             caseApplicationselect.setCaseStatusName(nextFlow.getCaseStatusName());
774
             caseApplicationselect.setCaseStatusName(nextFlow.getCaseStatusName());
770
             caseApplicationMapper.updateByPrimaryKeySelective(caseApplicationselect);
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
         return AjaxResult.success("签收成功");
779
         return AjaxResult.success("签收成功");