From 69a50dada3c48d87dc27f06ee598d6c5711dbe2e Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 19 八月 2022 18:56:47 +0800
Subject: [PATCH] 目标统计fix
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 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..d4b353d 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
@@ -16,6 +16,7 @@
import com.gkhy.safePlatform.targetDuty.service.CommonService;
import com.gkhy.safePlatform.targetDuty.service.ExamineMngService;
import com.gkhy.safePlatform.targetDuty.service.ExamineTemplateService;
+import com.sun.org.apache.bcel.internal.generic.IF_ACMPEQ;
import org.springframework.stereotype.Service;
import org.springframework.beans.factory.annotation.Autowired;
import com.gkhy.safePlatform.commons.enums.ResultCodes;
@@ -55,8 +56,8 @@
@Resource
private CommonService commonService;
-
-
+
+
@Override
public ResultVO queryAll(PageQuery<ExamineMngQueryCriteria> pageQuery) {
Long pageIndex = pageQuery.getPageIndex();
@@ -80,6 +81,30 @@
respList.forEach(f->{
f.setExamineDepartmentName(depNameMap.get(f.getExamineDepartmentId()));
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());
+
+ if (!idList.isEmpty()){
+ 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<>(
@@ -124,6 +149,7 @@
if(item != null){
f.setItemDetail(item.getItemDetail());
f.setContent(item.getContent());
+ f.setJudgeStandard(item.getJudgeStandard());
}
});
}
@@ -138,4 +164,4 @@
return dto;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.2