From 6f4ed9dbb428374e5513fbf88aae1377fd423a51 Mon Sep 17 00:00:00 2001
From: zhouxiantao <1026371446@qq.com>
Date: Sat, 14 Sep 2024 15:19:52 +0800
Subject: [PATCH] 综合查询

---
 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java |   94 +++++++++++++++++++++++------------------------
 1 files changed, 46 insertions(+), 48 deletions(-)

diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
index 9cc3474..6b23d49 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseTaskService.java
@@ -789,55 +789,53 @@
      * @return
      */
     public List<WechatCaseFlowDTO> wechatListCaseFlow(String caseId, String userId){
-        try{
-            // 封装办理流程
-            List<WechatCaseFlowDTO> list = new ArrayList<>();
-            CaseInfo caseInfo = caseInfoService.getById(caseId);
-            // 提交申请
-            WechatCaseFlowDTO tjsq = new WechatCaseFlowDTO();
-            tjsq.setProcessName("提交申请");
-            tjsq.setVisitWayName(caseInfo.getVisitWayName());
-            tjsq.setShowTime(caseInfo.getCreateTime());
-            tjsq.setCaseTypeName(caseInfo.getCaseTypeName());
-            list.add(tjsq);
-            // 办理中
-            if (caseInfo.getInfoProcess() == CaseInfoProcessBaseConstsEnum.CASE_INFO_PROCESS_2.getIndex()){
-                CaseInfoUnfold caseInfoUnfold = caseInfoUnfoldService.getById(caseId);
-                WechatCaseFlowDTO sxbl = new WechatCaseFlowDTO();
-                sxbl.setProcessName("事项办理");
-                sxbl.setShowTime(caseInfoUnfold.getAcceptTime());
-                sxbl.setMediateUnitName(caseInfoUnfold.getMediateUnitName());
-                list.add(sxbl);
-            }
-            // 已结案
-            if (caseInfo.getInfoProcess() == CaseInfoProcessBaseConstsEnum.CASE_INFO_PROCESS_2.getIndex()){
-                CaseInfoUnfold caseInfoUnfold = caseInfoUnfoldService.getById(caseId);
-                WechatCaseFlowDTO sxbj = new WechatCaseFlowDTO();
-                sxbj.setProcessName("事项办结");
-                sxbj.setShowTime(caseInfoUnfold.getCloseTime());
-                sxbj.setMediResult(caseInfoUnfold.getMediResult());
-                sxbj.setMediResultName(caseInfoUnfold.getMediResultName());
-                list.add(sxbj);
-            }
-            // 评价
-            QueryWrapper<CaseEvaluate> caseEvaluateQueryWrapper = new QueryWrapper<>();
-            caseEvaluateQueryWrapper.eq("case_id", caseId).orderByDesc("create_time");
-            List<CaseEvaluate> caseEvaluateList = caseEvaluateService.list(caseEvaluateQueryWrapper);
-            if (CollectionUtils.isNotEmpty(caseEvaluateList)){
-                CaseEvaluate caseEvaluate = caseEvaluateList.get(0);
-                WechatCaseFlowDTO sxpj = new WechatCaseFlowDTO();
-                sxpj.setProcessName("事项评价");
-                sxpj.setShowTime(caseEvaluate.getCreateTime());
-                sxpj.setEvaluateUserName(caseEvaluate.getEvaluateUserName());
-                sxpj.setEvaluateGrade(caseEvaluate.getEvaluateGrade());
-                sxpj.setEvaluateRemark(caseEvaluate.getEvaluateRemark());
-                list.add(sxpj);
-            }
-            return list;
-        }catch (Exception e){
-            log.error("[CaseTaskService.wechatListCaseFlow]调用失败,异常信息:"+e, e);
-            throw new ServiceException("CaseTaskService.wechatListCaseFlow", e);
+        // 封装办理流程
+        List<WechatCaseFlowDTO> list = new ArrayList<>();
+        CaseInfo caseInfo = caseInfoService.getById(caseId);
+        // 提交申请
+        WechatCaseFlowDTO tjsq = new WechatCaseFlowDTO();
+        tjsq.setProcessName("提交申请");
+        tjsq.setVisitWayName(caseInfo.getVisitWayName());
+        tjsq.setShowTime(caseInfo.getCreateTime());
+        tjsq.setCaseTypeName(caseInfo.getCaseTypeName());
+        tjsq.setProcessStep(1);
+        list.add(tjsq);
+        CaseInfoUnfold caseInfoUnfold = caseInfoUnfoldService.getById(caseId);
+        // 办理中
+        if (caseInfo.getInfoProcess() >= CaseInfoProcessBaseConstsEnum.CASE_INFO_PROCESS_2.getIndex()){
+            WechatCaseFlowDTO sxbl = new WechatCaseFlowDTO();
+            sxbl.setProcessName("事项办理");
+            sxbl.setShowTime(caseInfoUnfold.getAcceptTime());
+            sxbl.setMediateUnitName(caseInfoUnfold.getMediateUnitName());
+            sxbl.setProcessStep(2);
+            list.add(sxbl);
         }
+        // 已结案
+        if (caseInfo.getInfoProcess() >= CaseInfoProcessBaseConstsEnum.CASE_INFO_PROCESS_3.getIndex()){
+            WechatCaseFlowDTO sxbj = new WechatCaseFlowDTO();
+            sxbj.setProcessName("事项办结");
+            sxbj.setShowTime(caseInfoUnfold.getCloseTime());
+            sxbj.setMediResult(caseInfoUnfold.getMediResult());
+            sxbj.setMediResultName(caseInfoUnfold.getMediResultName());
+            sxbj.setProcessStep(3);
+            list.add(sxbj);
+        }
+        // 评价
+        QueryWrapper<CaseEvaluate> caseEvaluateQueryWrapper = new QueryWrapper<>();
+        caseEvaluateQueryWrapper.eq("case_id", caseId).orderByDesc("create_time");
+        List<CaseEvaluate> caseEvaluateList = caseEvaluateService.list(caseEvaluateQueryWrapper);
+        if (CollectionUtils.isNotEmpty(caseEvaluateList)){
+            CaseEvaluate caseEvaluate = caseEvaluateList.get(0);
+            WechatCaseFlowDTO sxpj = new WechatCaseFlowDTO();
+            sxpj.setProcessName("事项评价");
+            sxpj.setShowTime(caseEvaluate.getCreateTime());
+            sxpj.setEvaluateUserName(caseEvaluate.getEvaluateUserName());
+            sxpj.setEvaluateGrade(caseEvaluate.getEvaluateGrade());
+            sxpj.setEvaluateRemark(caseEvaluate.getEvaluateRemark());
+            sxpj.setProcessStep(4);
+            list.add(sxpj);
+        }
+        return list;
     }
 
     /**

--
Gitblit v1.8.0