From d887d1db33d88948c71c5af670033382079bb250 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 05 八月 2022 10:36:39 +0800
Subject: [PATCH] 删除物资接口fix

---
 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineTemplateServiceImpl.java |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineTemplateServiceImpl.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineTemplateServiceImpl.java
index 009f89a..5279424 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineTemplateServiceImpl.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineTemplateServiceImpl.java
@@ -14,6 +14,7 @@
 import com.gkhy.safePlatform.targetDuty.repository.ExamineItemRepository;
 import com.gkhy.safePlatform.targetDuty.repository.ExamineTemplateRepository;
 import com.gkhy.safePlatform.targetDuty.entity.ExamineTemplate;
+import com.gkhy.safePlatform.targetDuty.service.CommonService;
 import com.gkhy.safePlatform.targetDuty.service.ExamineItemService;
 import com.gkhy.safePlatform.targetDuty.service.ExamineTemplateService;
 import org.springframework.stereotype.Service;
@@ -28,11 +29,10 @@
 import com.gkhy.safePlatform.commons.utils.BeanCopyUtils;
 import org.springframework.util.StringUtils;
 
+import javax.annotation.Resource;
 import java.io.Serializable;
 import java.sql.Timestamp;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -52,6 +52,9 @@
 
     @Autowired
     private ExamineItemService examineItemService;
+
+    @Resource
+    private CommonService commonService;
     
 	
 	@Override
@@ -64,7 +67,18 @@
                 QueryHelpPlus.getPredicate(ExamineTemplate.class, pageQuery.getSearchParams()));
         List<ExamineTemplateDto> respList = BeanCopyUtils.copyBeanList(page.getRecords(), ExamineTemplateDto.class);
 
-        // TODO:获取设定人部门名称
+        // --------------------------- 获取部门信息-----------------------
+        //收集所用到的部门ID
+        Set<Long> collectDepIdSet = new HashSet();
+        respList.forEach(f->{
+            collectDepIdSet.add(f.getSetPersonDepartmentId());
+        });
+        //获取部门名集合
+        Map<Long,String> depNameMap = commonService.getDepName(collectDepIdSet);
+
+        respList.forEach(f->{
+            f.setSetPersonDepartmentName(depNameMap.get(f.getSetPersonDepartmentId()));
+        });
 
 
         return new SearchResultVO<>(

--
Gitblit v1.9.2