From 3ce77531a4e13d749d58fea1a13695a80fbb9516 Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Sun, 15 Sep 2024 12:19:13 +0800
Subject: [PATCH] 1、自行受理跳转bug修复 2、联合处置流程优化

---
 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAssistApplyService.java |   41 +++++++++++++++++++++++------------------
 1 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAssistApplyService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAssistApplyService.java
index 3649d2a..ffa776c 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAssistApplyService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseAssistApplyService.java
@@ -189,7 +189,7 @@
     }
 
     /**
-     * 审核联合处置申请
+     * 审核联合处置审核
      * @param caseAssistApply 实体对象
      */
     public void reviewCaseAssistApply(CaseAssistApply caseAssistApply, String userId){
@@ -240,13 +240,13 @@
                     dslCaseTask.setCreateTime(now);
                     dslCaseTask.setUpdateTime(now);
                     caseTaskService.save(dslCaseTask);
-                    // 更新纠纷扩展信息
-                    CaseInfoUnfold caseInfoUnfoldPO = new CaseInfoUnfold();
-                    caseInfoUnfoldPO.setId(dslCaseTask.getCaseId());
-                    caseInfoUnfoldPO.setAssistUnitId(caseAssistApply.getApplyAssistUnitId());
-                    caseInfoUnfoldPO.setAssistUnitName(caseAssistApply.getApplyAssistUnitName());
-                    caseInfoUnfoldService.updateCaseInfoUnfold(caseInfoUnfoldPO);
                 }
+                // 更新纠纷扩展信息
+                CaseInfoUnfold caseInfoUnfoldPO = new CaseInfoUnfold();
+                caseInfoUnfoldPO.setId(caseAssistApply.getCaseId());
+                caseInfoUnfoldPO.setAssistUnitId(caseAssistApply.getApplyAssistUnitId());
+                caseInfoUnfoldPO.setAssistUnitName(caseAssistApply.getApplyAssistUnitName());
+                caseInfoUnfoldService.updateCaseInfoUnfold(caseInfoUnfoldPO);
             }
         }catch (Exception e){
             log.error("[CaseAssistApplyService.reviewCaseAssistApply]调用失败,异常信息:"+e, e);
@@ -260,18 +260,23 @@
      * @return long
      */
     public CaseAssistApply caseAssistApplyByCaseId(String caseId){
-        QueryWrapper<CaseAssistApply> caseAssistApplyQueryWrapper = new QueryWrapper<>();
-        caseAssistApplyQueryWrapper.eq("case_id", caseId).eq("apply_status", 0)
-                .orderByDesc("create_time");
-        CaseAssistApply caseAssistApply = mapper.selectOne(caseAssistApplyQueryWrapper);
-        Map<String, Object> terms = new HashMap<>();
-        terms.put("mainId", caseId);
-        terms.put("ownerIds", "'" + caseAssistApply.getId() + "'");
-        List<FileIdInfoBaseDTO> fileIdInfoBaseDTOList = sysClient.listIdInfoByOwnerIdList(terms);
-        if(CollectionUtils.isNotEmpty(fileIdInfoBaseDTOList)){
-            caseAssistApply.setFileInfoBaseDTOList(fileIdInfoBaseDTOList.get(0).getFileList());
+        try {
+            QueryWrapper<CaseAssistApply> caseAssistApplyQueryWrapper = new QueryWrapper<>();
+            caseAssistApplyQueryWrapper.eq("case_id", caseId).eq("apply_status", 0)
+                    .orderByDesc("create_time");
+            CaseAssistApply caseAssistApply = mapper.selectOne(caseAssistApplyQueryWrapper);
+            Map<String, Object> terms = new HashMap<>();
+            terms.put("mainId", caseId);
+            terms.put("ownerIds", "'" + caseAssistApply.getId() + "'");
+            List<FileIdInfoBaseDTO> fileIdInfoBaseDTOList = sysClient.listIdInfoByOwnerIdList(terms);
+            if (CollectionUtils.isNotEmpty(fileIdInfoBaseDTOList)) {
+                caseAssistApply.setFileInfoBaseDTOList(fileIdInfoBaseDTOList.get(0).getFileList());
+            }
+            return caseAssistApply;
+        }catch(Exception e ){
+            log.error("[CaseAssistApplyService.caseAssistApplyByCaseId]调用失败,异常信息:"+e, e);
+            throw new ServiceException("CaseAssistApplyService.caseAssistApplyByCaseId", e);
         }
-        return caseAssistApply;
     }
 
     /**

--
Gitblit v1.8.0