From 1a88af49dd7a6e6a4c4d202f2ba02d29e88b46df Mon Sep 17 00:00:00 2001
From: wany <13995595726@qq.com>
Date: Fri, 13 Sep 2024 13:16:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=80=83=E6=A0=B8=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E6=8C=89=E8=80=83=E6=A0=B8=E6=97=B6=E9=97=B4=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=EF=BC=9B=E8=A7=A3=E5=86=B3=E8=AF=84=E5=88=86=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E6=9C=AA=E8=AE=A1=E7=AE=97=E7=AD=89=E7=BA=A7=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=9B=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  | 10 ++++--
 .../xyt/service/AssessTaskService.java        | 18 +++++++++++
 .../xyt/service/AssessTeamRatingService.java  | 31 ++++++++-----------
 3 files changed, 38 insertions(+), 21 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 9097f0f..44f01ba 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/AssessTaskMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/AssessTaskMapper.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gunshi.db.dto.MonthRangeSo;
 import com.gunshi.project.xyt.entity.so.AssessTaskPageSo;
 import com.gunshi.project.xyt.entity.vo.AssessResultVo;
+import com.gunshi.project.xyt.model.AssessIndicator;
 import com.gunshi.project.xyt.model.AssessObject;
 import com.gunshi.project.xyt.model.AssessTask;
 import org.apache.ibatis.annotations.Mapper;
@@ -23,11 +24,12 @@ public interface AssessTaskMapper extends BaseMapper<AssessTask> {
 
     @Select("""
             <script>
-                select t1.indicator_id from public.assess_template_indicator_rel t1
+                select t1.indicator_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>
              """)
-    List<Long> queryIndicators(@Param("templateId") Long templateId);
+    List<AssessIndicator> queryIndicators(@Param("templateId") Long templateId);
 
     @Select("""
             <script>
@@ -84,7 +86,8 @@ public interface AssessTaskMapper extends BaseMapper<AssessTask> {
 
     @Select("""
             <script>
-                select t.object_id,t.indicator_id,t.standard_score,t.assess_score,s.object_user_name,s.assess_score as resScore,m.indicator_name,n.name as categoryName from public.assess_object_rating t 
+                select t.object_id,t.indicator_id,t.standard_score,t.assess_score,s.object_user_name,s.assess_score as resScore,m.indicator_name,n.name as categoryName 
+                from public.assess_object_rating t 
                 left join public.assess_object s on t.object_id = s.id 
                 left join public.assess_indicator m on t.indicator_id = m.id
                 left join public.assess_category n on m.category_id = n.id
@@ -108,6 +111,7 @@ public interface AssessTaskMapper extends BaseMapper<AssessTask> {
                 where t.status = 3
                 and date_trunc('MONTH', t.start_date) <![CDATA[>=]]> #{obj.start}
                 and date_trunc('MONTH', t.start_date) <![CDATA[<=]]> #{obj.end}
+                order by t.start_date
             </script>
              """)
     List<AssessTask> resultStat(@Param("obj") MonthRangeSo monthRangeSo);
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 7c3391b..0d94a89 100644
--- a/src/main/java/com/gunshi/project/xyt/service/AssessTaskService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/AssessTaskService.java
@@ -45,6 +45,9 @@ public class AssessTaskService extends ServiceImpl<AssessTaskMapper, AssessTask>
     @Autowired
     private AssessObjectRatingMapper objectRatingMapper;
 
+    @Autowired
+    private AssessTeamRatingService teamRatingService;
+
     public AssessTask saveData(AssessTask dto) {
         dto.setId(IdWorker.getId());
         dto.setStatus(0);
@@ -116,6 +119,21 @@ 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());
+        for(AssessTeam team : teams){
+            for(AssessIndicator indicator : indicatorIds){
+                AssessTeamRating rating = new AssessTeamRating();
+                rating.setId(IdWorker.getId());
+                rating.setTeamId(team.getId());
+                rating.setIndicatorId(indicator.getId());
+                rating.setStandardScore(indicator.getStandardScore());
+                ratings.add(rating);
+            }
+        }
+        teamRatingService.saveBatch(ratings);
         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 c5d79ac..3691e26 100644
--- a/src/main/java/com/gunshi/project/xyt/service/AssessTeamRatingService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/AssessTeamRatingService.java
@@ -56,8 +56,11 @@ public class AssessTeamRatingService extends ServiceImpl<AssessTeamRatingMapper,
     @Autowired
     private AssessIndicatorRatingService indicatorRatingService;
 
+    public Boolean saveScore(AssessScoreVo vo) {
+        return commonScore(vo,9);
+    }
 
-    public Boolean score(AssessScoreVo vo) {
+    private Boolean commonScore(AssessScoreVo vo,Integer status){
         List<AssessTeamRating> ratings = vo.getRatings();
         Long teamId = ratings.get(0).getTeamId();
         this.delData(teamId);
@@ -69,7 +72,7 @@ public class AssessTeamRatingService extends ServiceImpl<AssessTeamRatingMapper,
         AssessTask task = taskMapper.selectById(vo.getTaskId());
         //更新该考核人员对考核对象的状态为已评分
         AssessTeam assessTeam = teamMapper.selectById(teamId);
-        assessTeam.setStatus(2);
+        assessTeam.setStatus(status);
         //获取模板信息
         AssessTemplate template = templateMapper.selectById(task.getTemplateId());
         //根据总得分计算等级
@@ -78,10 +81,16 @@ public class AssessTeamRatingService extends ServiceImpl<AssessTeamRatingMapper,
         assessTeam.setAssessLevel(level);
         teamMapper.updateById(assessTeam);
         Boolean res = this.saveBatch(ratings);
-        updateObjectAndTask(assessTeam.getObjectId(),vo.getTaskId(),template,task);
+        if(status == 2){
+            updateObjectAndTask(assessTeam.getObjectId(),vo.getTaskId(),template,task);
+        }
         return res;
     }
 
+    public Boolean score(AssessScoreVo vo) {
+        return commonScore(vo,2);
+    }
+
     private void delData(Long teamId) {
         List<AssessTeamRating> teamRatings = this.list(new QueryWrapper<AssessTeamRating>().eq("team_id", teamId));
         if(CollectionUtils.isNotEmpty(teamRatings)){
@@ -176,21 +185,7 @@ public class AssessTeamRatingService extends ServiceImpl<AssessTeamRatingMapper,
         return list;
     }
 
-    public Boolean saveScore(AssessScoreVo vo) {
-        List<AssessTeamRating> ratings = vo.getRatings();
-        for(AssessTeamRating rating : ratings){
-            rating.setId(IdWorker.getId());
-            rating.setRectifyStatus(0);
-            fileService.save(rating.getFiles(), rating.getId().toString(), getGroupId(),getScoreType());
-        }
-        Long teamId = ratings.get(0).getTeamId();
-        this.delData(teamId);
-        AssessTeam assessTeam = teamMapper.selectById(teamId);
-        assessTeam.setAssessScore(vo.getScore());
-        assessTeam.setStatus(9);
-        teamMapper.updateById(assessTeam);
-        return this.saveOrUpdateBatch(ratings);
-    }
+
 
     public Map<Long,List<AssessRatingVo>> scoreDetail(Long objectId) {
         List<AssessRatingVo> list = this.baseMapper.scoreByObjectId(objectId);