From fe1cda6c676453b22aba86c52252afb74809694a Mon Sep 17 00:00:00 2001
From: wany <13995595726@qq.com>
Date: Fri, 13 Sep 2024 13:58:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9C=AA=E8=AF=84=E5=88=86?=
 =?UTF-8?q?=E6=97=B6=E8=80=83=E6=A0=B8=E4=BB=BB=E5=8A=A1=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E4=B8=AD=E6=9F=A5=E7=9C=8B=E8=AF=84=E5=88=86=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/xyt/mapper/AssessTaskMapper.java       |  2 +-
 .../project/xyt/service/AssessTaskService.java     | 14 +++++++++++++-
 .../xyt/service/AssessTeamRatingService.java       |  7 ++++++-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gunshi/project/xyt/mapper/AssessTaskMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/AssessTaskMapper.java
index 44f01ba..6518237 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/AssessTaskMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/AssessTaskMapper.java
@@ -24,7 +24,7 @@ public interface AssessTaskMapper extends BaseMapper<AssessTask> {
 
     @Select("""
             <script>
-                select t1.indicator_id,t2.standard_score from public.assess_template_indicator_rel t1
+                select t1.id,t2.standard_score from public.assess_template_indicator_rel t1
                 left join public.assess_indicator t2 on t1.indicator_id = t2.id
                 where t1.template_id = #{templateId}
             </script>
diff --git a/src/main/java/com/gunshi/project/xyt/service/AssessTaskService.java b/src/main/java/com/gunshi/project/xyt/service/AssessTaskService.java
index 0d94a89..25e1f1a 100644
--- a/src/main/java/com/gunshi/project/xyt/service/AssessTaskService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/AssessTaskService.java
@@ -119,7 +119,6 @@ public class AssessTaskService extends ServiceImpl<AssessTaskMapper, AssessTask>
         List<AssessTeam> teams = assessObjectService.getTeam(id);
         teams.stream().forEach(o->o.setStatus(1));
         assessObjectService.updateTeams(teams);
-
         //考核指标
         List<AssessTeamRating> ratings = new ArrayList<>();
         List<AssessIndicator> indicatorIds = this.baseMapper.queryIndicators(task.getTemplateId());
@@ -134,6 +133,19 @@ public class AssessTaskService extends ServiceImpl<AssessTaskMapper, AssessTask>
             }
         }
         teamRatingService.saveBatch(ratings);
+
+        List<AssessObjectRating> list = new ArrayList<>();
+        for(AssessObject object : objects){
+            for(AssessIndicator indicator : indicatorIds){
+                AssessObjectRating objectRating = new AssessObjectRating();
+                objectRating.setId(IdWorker.getId());
+                objectRating.setObjectId(object.getId());
+                objectRating.setIndicatorId(indicator.getId());
+                objectRating.setStandardScore(indicator.getStandardScore());
+                list.add(objectRating);
+            }
+        }
+        teamRatingService.saveObjectRating(list);
         return "启动成功";
     }
 
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 3691e26..315413d 100644
--- a/src/main/java/com/gunshi/project/xyt/service/AssessTeamRatingService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/AssessTeamRatingService.java
@@ -140,6 +140,7 @@ public class AssessTeamRatingService extends ServiceImpl<AssessTeamRatingMapper,
     }
 
     private BigDecimal calcScore(Integer scoreWay, List<Long> teamIds,Long objectId) {
+        assessObjectRatingService.remove(new QueryWrapper<AssessObjectRating>().eq("object_id",objectId));
         final BigDecimal[] score = {new BigDecimal(0)};
         List<AssessTeamRating> ratings = this.list(new QueryWrapper<AssessTeamRating>().in("team_id",teamIds));
         Map<Long, List<BigDecimal>> map = ratings.stream().collect(Collectors.groupingBy(AssessTeamRating::getIndicatorId,Collectors.mapping(AssessTeamRating::getAssessScore,Collectors.toList())));
@@ -167,6 +168,10 @@ public class AssessTeamRatingService extends ServiceImpl<AssessTeamRatingMapper,
         return score[0];
     }
 
+    public void saveObjectRating(List<AssessObjectRating> list){
+        assessObjectRatingService.saveBatch(list);
+    }
+
     public String getGroupId() {
         return "assessTeamRating";
     }
@@ -198,7 +203,7 @@ public class AssessTeamRatingService extends ServiceImpl<AssessTeamRatingMapper,
         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){
+            if(vo.getIsNeedRectify() != null &&  vo.getIsNeedRectify() == 1){
                 vo.setFiles(fileService.queryFileList(vo.getId().toString(),getGroupId(),getScoreType()));
             }
         }