From 01a31c6c5ffe0d430b5c47af431502aa86153f66 Mon Sep 17 00:00:00 2001
From: wangwh <2397901735@qq.com>
Date: Fri, 20 Sep 2024 18:04:12 +0800
Subject: [PATCH] 督办bug修复

---
 dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseSuperviseService.java |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 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 8eed38b..7194f76 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
@@ -149,6 +149,8 @@
                 Date nowDate = DateUtils.getNowDate();
                 caseSuperviseNew.setSupUserId(loginUser.getId());
                 caseSuperviseNew.setSupUserName(loginUser.getTrueName());
+                caseSuperviseNew.setSupUnitId(loginUser.getUnitId());
+                caseSuperviseNew.setSupUnitName(loginUser.getUnitName());
                 caseSuperviseNew.setSupTime(nowDate);
                 caseSuperviseNew.setQuiltUnitId(quiltUnitDTO.getQuiltUnitId());
                 caseSuperviseNew.setQuiltUnitName(quiltUnitDTO.getQuiltUnitName());
@@ -177,7 +179,7 @@
             caseSupervise.setSupStatus(1);
             caseSupervise.setReplyUserId(loginUser.getId());
             caseSupervise.setReplyUserName(loginUser.getTrueName());
-            caseSupervise.setReplyTime(String.valueOf(now));
+            caseSupervise.setReplyTime(now);
             caseSupervise.setUpdateTime(now);
             mapper.updateCaseSupervise(caseSupervise);
         }catch (Exception e){
@@ -199,8 +201,8 @@
 
             Map<String, Object>map = new HashMap<>();
             map.put("mainId", caseId);
-            map.put("ownerIds", caseSuperviseList.stream().map(CaseSupervise::getId).collect(Collectors.joining("','")));
-            map.put("types", FileOwnerTypeBaseEnum.OWNER_TYPE_506.getIndex());
+            map.put("ownerIds", "'" + caseSuperviseList.stream().map(CaseSupervise::getId).collect(Collectors.joining("','"))+ "'");
+            map.put("types", "'"+ FileOwnerTypeBaseEnum.OWNER_TYPE_506.getIndex()+ "'");
             List<FileIdTypeInfoBaseDTO> fileIdTypeInfoBaseDTOList = sysClient.listIdTypeInfoByOwnerIdList(map);
             for(CaseSupervise caseSupervise: caseSuperviseList){
                 for(FileIdTypeInfoBaseDTO fileIdTypeInfoBaseDTO: fileIdTypeInfoBaseDTOList){
@@ -217,6 +219,22 @@
     }
 
     /**
+     * 首页-督办
+     * @param page
+     * @param terms
+     */
+    public Page<CaseSupervise> pageMyTaskDb(PageRequest page, Map<String, Object> terms){
+        try{
+            long countSuperviseList = mapper.countMyTaskDb(terms);
+            List<CaseSupervise> caseSuperviseList = mapper.pageMyTaskDb(page, terms);
+            return new PageImpl<CaseSupervise>(caseSuperviseList, page, countSuperviseList);
+        }catch (Exception e){
+            log.error("[CaseSuperviseService.pageReplied]调用失败,异常信息:"+e, e);
+            throw new ServiceException("CaseSuperviseService.pageReplied", e);
+        }
+    }
+
+    /**
      * 查询督办数量
      * @param supStatus 回复状态
      * @param quiltUnitId 被督办组织编号

--
Gitblit v1.8.0