From 2595c1008bfe2d0d5e01f3b6b035faa7ccb8a2b8 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 19 八月 2022 17:46:03 +0800
Subject: [PATCH] 目标考核

---
 goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java
index 3b9fbd7..229f028 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java
@@ -82,6 +82,28 @@
             f.setBeExaminedDepartmentName(depNameMap.get(f.getBeExaminedDepartmentId()));
         });
 
+        //获取打分明细
+        respList.forEach(dto->{
+            List<CurrentExamineDto> list = JSONObject.parseArray( dto.getNumberDetailJson(), CurrentExamineDto.class);
+            List<Long> idList = list.stream().map(CurrentExamineDto::getId).collect(Collectors.toList());
+
+            List<ExamineItem> itemList = examineItemRepository.selectBatchIds(idList);
+            Map<Long,ExamineItem> itemMap = itemList.stream().collect(
+                    Collectors.toMap(ExamineItem::getId, Function.identity(),(k1, k2)->k1));
+
+            if(itemMap != null){
+                list.forEach(f->{
+                    ExamineItem item = itemMap.get(f.getId());
+                    if(item != null){
+                        f.setItemDetail(item.getItemDetail());
+                        f.setContent(item.getContent());
+                        f.setJudgeStandard(item.getJudgeStandard());
+                    }
+                });
+            }
+            dto.setCurrentExamineDtoList(list);
+        });
+
         return new SearchResultVO<>(
                 true,
                 pageIndex,
@@ -124,6 +146,7 @@
                 if(item != null){
                     f.setItemDetail(item.getItemDetail());
                     f.setContent(item.getContent());
+                    f.setJudgeStandard(item.getJudgeStandard());
                 }
             });
         }

--
Gitblit v1.9.2