From fabd08d87d00bfdf1aacf473fd905fdd3c903ed3 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 02 九月 2022 10:10:14 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into genchuang
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/service/impl/ExamineMngServiceImpl.java | 58 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 15 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 e7b98c0..2ad8d65 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
@@ -55,8 +55,8 @@
@Resource
private CommonService commonService;
-
-
+
+
@Override
public ResultVO queryAll(PageQuery<ExamineMngQueryCriteria> pageQuery) {
Long pageIndex = pageQuery.getPageIndex();
@@ -80,6 +80,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<>(
@@ -113,19 +137,21 @@
//获取打分明细
List<CurrentExamineDto> list = JSONObject.parseArray( examineMng.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));
- 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());
- }
- });
+ 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);
@@ -133,7 +159,9 @@
ExamineTemplate examineTemplate = examineTemplateRepository.selectOne(new QueryWrapper<ExamineTemplate>().eq("id",examineMng.getExamineTemplateId()));
if(examineTemplate != null){
dto.setAcceptanceNumber(examineTemplate.getAcceptanceNumber());
+ dto.setExamineTemplateName(examineTemplate.getTitle());
}
+
return dto;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.2