From 069d1a95b682c3db281e4eae394594123526bb97 Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Thu, 12 Sep 2024 15:48:54 +0800
Subject: [PATCH] 1、流程优化

---
 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoUnfoldService.java |   61 ++++++++++++++++++------------
 1 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoUnfoldService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoUnfoldService.java
index 5ce5c6d..090f220 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoUnfoldService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoUnfoldService.java
@@ -12,10 +12,15 @@
 import cn.huge.module.cases.dao.mapper.CaseInfoUnfoldMapper;
 import cn.huge.module.cases.domain.po.CaseInfoUnfold;
 import cn.huge.module.cust.dto.CtUserDTO;
+import cn.huge.module.mediate.constant.AuditBaseConstsEnum;
 import cn.huge.module.mediate.constant.CaseBaseConsts;
+import cn.huge.module.mediate.constant.CaseBaseConstsEnum;
+import cn.huge.module.sys.constant.FileOwnerTypeBaseEnum;
 import cn.huge.module.sys.dto.FileIdInfoBaseDTO;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Maps;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -158,12 +163,11 @@
             // 获取当前登录用户
             CtUserDTO loginUser = custClient.clientGetUserAll(userId);
             CaseInfoUnfold CaseInfoUnfold = new CaseInfoUnfold();
+            CaseInfoUnfold.setId(caseId);
             CaseInfoUnfold.setMediatorId(loginUser.getId());
             CaseInfoUnfold.setMediator(loginUser.getTrueName());
             CaseInfoUnfold.setMediatorMobile(loginUser.getMobile());
-            Map<String, Object> terms = new HashMap<>();
-            terms.put("case_id", caseId);
-            mapper.updateCaseInfoUnfoldTerms(CaseInfoUnfold, terms);
+            mapper.updateCaseInfoUnfold(CaseInfoUnfold);
         }catch (Exception e){
             log.error("[CaseInfoUnfoldService.choosePrincipal]调用失败,异常信息:"+e, e);
             throw new ServiceException("CaseInfoUnfoldService.choosePrincipal", e);
@@ -171,31 +175,38 @@
     }
 
     public TransactResultDTO getTransactResult(String caseId){
-        //查询办理结果信息
-        QueryWrapper<CaseInfoUnfold>caseInfoUnfoldQueryWrapper = new QueryWrapper<>();
-        caseInfoUnfoldQueryWrapper.eq("case_id", caseId);
-        CaseInfoUnfold caseInfoUnfold = this.getOne(caseInfoUnfoldQueryWrapper);
+        try {
+            //查询办理结果信息
+            CaseInfoUnfold caseInfoUnfold = this.getById(caseId);
+            if(StringUtils.isNotBlank(caseInfoUnfold.getMediResult())) {
+                TransactResultDTO transactResultDTO = new TransactResultDTO();
+                BeanUtils.copyProperties(caseInfoUnfold, transactResultDTO);
+                if (ObjectUtils.isNotEmpty(transactResultDTO)) {
+                    QueryWrapper<CaseAssistApply> caseAssistApplyQueryWrapper = new QueryWrapper<>();
+                    caseAssistApplyQueryWrapper.select("apply_assist_unit_name").eq("case_id", caseId).eq("apply_status", 1)
+                            .eq("audit_result", AuditBaseConstsEnum.AUDIT_RESULT_1.getIndex());
+                    CaseAssistApply caseAssistApply = assistApplyService.getOne(caseAssistApplyQueryWrapper);
 
-        TransactResultDTO transactResultDTO = new TransactResultDTO();
-        BeanUtils.copyProperties(caseInfoUnfold, transactResultDTO);
-        if(ObjectUtils.isNotEmpty(transactResultDTO)){
-            QueryWrapper<CaseAssistApply> caseAssistApplyQueryWrapper = new QueryWrapper<>();
-            caseAssistApplyQueryWrapper.select("apply_assist_unit_name").eq("case_id", caseId).eq("apply_status", 1)
-                    .eq("audit_result", CaseBaseConsts.AUDIT_RESULT_1);
-            CaseAssistApply caseAssistApply = assistApplyService.getOne(caseAssistApplyQueryWrapper);
-
-            if(ObjectUtils.isNotEmpty(caseAssistApply)){
-                transactResultDTO.setApplyAssistUnitName(caseAssistApply.getApplyAssistUnitName());
+                    if (ObjectUtils.isNotEmpty(caseAssistApply)) {
+                        transactResultDTO.setApplyAssistUnitName(caseAssistApply.getApplyAssistUnitName());
+                    }
+                }
+                Map<String, Object> terms = new HashMap<>();
+                terms.put("mainId", caseId);
+                terms.put("ownerIds", "'" + caseId + "'");
+                terms.put("types", "'" + FileOwnerTypeBaseEnum.OWNER_TYPE_302.getIndex() + "'");
+                List<FileIdInfoBaseDTO> fileIdInfoBaseDTOList = sysClient.listIdInfoByOwnerIdList(terms);
+                if (ObjectUtils.isNotEmpty(fileIdInfoBaseDTOList)) {
+                    transactResultDTO.setFileInfoBaseDTOList(fileIdInfoBaseDTOList.get(0).getFileList());
+                }
+                return transactResultDTO;
+            }else {
+                return null;
             }
+        }catch (Exception e){
+            log.error("[CaseInfoUnfoldService.getTransactResult]调用失败,异常信息:"+e, e);
+            throw new ServiceException("CaseInfoUnfoldService.getTransactResult", e);
         }
-        Map<String, Object> terms = new HashMap<>();
-        terms.put("mainId", caseId);
-        terms.put("ownerIds", "'"+caseId+"'");
-        List<FileIdInfoBaseDTO> fileIdInfoBaseDTOList = sysClient.listIdInfoByOwnerIdList(terms);
-        if(ObjectUtils.isNotEmpty(fileIdInfoBaseDTOList)){
-            transactResultDTO.setFileInfoBaseDTOList(fileIdInfoBaseDTOList.get(0).getFileList());
-        }
-        return transactResultDTO;
     }
 
 }

--
Gitblit v1.8.0