From 55a6ee00c9bb89556a1ba53a3a763fa20230e030 Mon Sep 17 00:00:00 2001
From: wangwh <2397901735@qq.com>
Date: Sun, 22 Sep 2024 20:36:08 +0800
Subject: [PATCH] 督办相关接口bug修复、附件查询相关修改

---
 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseSuperviseService.java |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseSuperviseService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseSuperviseService.java
index 6cb637b..9347be4 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseSuperviseService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseSuperviseService.java
@@ -3,8 +3,11 @@
 import cn.huge.base.common.exception.ServiceException;
 import cn.huge.base.common.utils.DateUtils;
 import cn.huge.base.common.utils.IdUtils;
+import cn.huge.base.common.utils.ObjectUtils;
 import cn.huge.module.cases.domain.dto.FileRelateDTO;
 import cn.huge.module.cases.domain.dto.QuiltUnitDTO;
+import cn.huge.module.cases.domain.po.CaseInfo;
+import cn.huge.module.cases.domain.po.CaseInfoUnfold;
 import cn.huge.module.client.api.impl.CustClientImpl;
 import cn.huge.module.client.api.impl.SysClientImpl;
 import cn.huge.module.client.api.impl.UtilsClientImpl;
@@ -57,6 +60,9 @@
 
     @Autowired
     private SysClientImpl sysClient;
+
+    @Autowired
+    private CaseInfoService caseInfoService;
 
     /**
     * 条件更新对象
@@ -228,6 +234,18 @@
             }
             long countSuperviseList = mapper.countCaseSupervise(terms);
             List<CaseSupervise> caseSuperviseList = mapper.pageCaseSupervise(terms, page);
+            CaseInfo caseInfo = new CaseInfo();
+            if(1 != type && CollectionUtils.isNotEmpty(caseSuperviseList)){
+                QueryWrapper<CaseInfo>caseInfoQueryWrapper = new QueryWrapper<>();
+                caseInfoQueryWrapper.eq("id", caseId);
+                caseInfo = caseInfoService.getOne(caseInfoQueryWrapper);
+                for(CaseSupervise caseSupervise: caseSuperviseList){
+                    if(ObjectUtils.isNotEmpty(caseInfo)){
+                        caseSupervise.setCaseGrade(caseInfo.getCaseLevel());
+                    }
+                }
+
+            }
 
             Map<String, Object>map = new HashMap<>();
             map.put("mainId", caseId);
@@ -283,7 +301,7 @@
         try {
             CaseSupervise caseSupervise = mapper.selectById(id);
             Map<String, Object> terms = new HashMap<>();
-            terms.put("mainId", "'" + caseSupervise.getCaseId() + "'");
+            terms.put("mainId", caseSupervise.getCaseId());
             terms.put("ownerIds", "'" + id + "'");
             List<FileIdTypeInfoBaseDTO> fileIdTypeInfoBaseDTOList = sysClient.listIdTypeInfoByOwnerIdList(terms);
             if(CollectionUtils.isNotEmpty(fileIdTypeInfoBaseDTOList)){

--
Gitblit v1.8.0