From d2306e47c0d4441c75a1d8b3d92cb5f2149a3a1e Mon Sep 17 00:00:00 2001
From: wany <13995595726@qq.com>
Date: Thu, 12 Sep 2024 14:38:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=AF=84=E5=88=86=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E8=BF=94=E5=9B=9E=E8=AF=84=E5=88=86=E7=BB=86=E5=88=99?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/xyt/entity/vo/AssessRatingVo.java |  5 +++++
 .../xyt/service/AssessTeamRatingService.java  | 21 ++++++++++++++-----
 .../xyt/service/AssessTemplateService.java    |  3 ++-
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/AssessRatingVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/AssessRatingVo.java
index 14a9235..788c325 100644
--- a/src/main/java/com/gunshi/project/xyt/entity/vo/AssessRatingVo.java
+++ b/src/main/java/com/gunshi/project/xyt/entity/vo/AssessRatingVo.java
@@ -2,11 +2,13 @@ package com.gunshi.project.xyt.entity.vo;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.gunshi.project.xyt.model.AssessIndicatorRating;
 import com.gunshi.project.xyt.model.AssessTeamRating;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 @Data
 public class AssessRatingVo extends AssessTeamRating {
@@ -34,4 +36,7 @@ public class AssessRatingVo extends AssessTeamRating {
     @Schema(description="考核成员")
     private String teamUserName;
 
+    @Schema(description = "评分细则")
+    private List<AssessIndicatorRating> indicatorRatings;
+
 }
diff --git a/src/main/java/com/gunshi/project/xyt/service/AssessTeamRatingService.java b/src/main/java/com/gunshi/project/xyt/service/AssessTeamRatingService.java
index 621182d..c5d79ac 100644
--- a/src/main/java/com/gunshi/project/xyt/service/AssessTeamRatingService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/AssessTeamRatingService.java
@@ -53,6 +53,9 @@ public class AssessTeamRatingService extends ServiceImpl<AssessTeamRatingMapper,
     @Autowired
     private AssessObjectRatingService assessObjectRatingService;
 
+    @Autowired
+    private AssessIndicatorRatingService indicatorRatingService;
+
 
     public Boolean score(AssessScoreVo vo) {
         List<AssessTeamRating> ratings = vo.getRatings();
@@ -169,11 +172,7 @@ public class AssessTeamRatingService extends ServiceImpl<AssessTeamRatingMapper,
 
     public List<AssessRatingVo> doDetail(Long teamId) {
         List<AssessRatingVo> list = this.baseMapper.scoreDetail(teamId);
-        for (AssessRatingVo vo : list){
-            if(vo.getIsNeedRectify() == 1){
-                vo.setFiles(fileService.queryFileList(vo.getId().toString(),getGroupId(),getScoreType()));
-            }
-        }
+        fillRating(list);
         return list;
     }
 
@@ -195,9 +194,21 @@ public class AssessTeamRatingService extends ServiceImpl<AssessTeamRatingMapper,
 
     public Map<Long,List<AssessRatingVo>> scoreDetail(Long objectId) {
         List<AssessRatingVo> list = this.baseMapper.scoreByObjectId(objectId);
+        fillRating(list);
         return list.stream().collect(Collectors.groupingBy(AssessTeamRating::getIndicatorId));
     }
 
+    private void fillRating(List<AssessRatingVo> list){
+        List<AssessIndicatorRating> relList = indicatorRatingService.queryRatingList(list.stream().map(AssessRatingVo::getIndicatorId).distinct().collect(Collectors.toList()));
+        Map<Long, List<AssessIndicatorRating>> map = relList.stream().collect(Collectors.groupingBy(AssessIndicatorRating::getIndicatorId));
+        for (AssessRatingVo vo : list){
+            vo.setIndicatorRatings(map.get(vo.getIndicatorId()));
+            if(vo.getIsNeedRectify() == 1){
+                vo.setFiles(fileService.queryFileList(vo.getId().toString(),getGroupId(),getScoreType()));
+            }
+        }
+    }
+
     public Page<AssessRectifyVo> listPage(AssessTaskPageSo page) {
         Page<AssessRectifyVo> res = this.baseMapper.listPage(page.getPageSo().toPage(), page);
         if (res.getRecords() != null && res.getRecords().size() > 0) {
diff --git a/src/main/java/com/gunshi/project/xyt/service/AssessTemplateService.java b/src/main/java/com/gunshi/project/xyt/service/AssessTemplateService.java
index 7db67b5..8a39826 100644
--- a/src/main/java/com/gunshi/project/xyt/service/AssessTemplateService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/AssessTemplateService.java
@@ -35,7 +35,8 @@ public class AssessTemplateService extends ServiceImpl<AssessTemplateMapper, Ass
     @Autowired
     private AssessTemplateIndicatorRelService relService;
 
-    @Autowired AssessIndicatorService indicatorService;
+    @Autowired
+    private AssessIndicatorService indicatorService;
 
     public AssessTemplate saveData(AssessTemplate dto) {
         dto.setId(IdWorker.getId());