From ca5cc9577394c2f96f0770501fefcf479a168a74 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Thu, 19 Nov 2020 11:47:58 +0800
Subject: [PATCH] 20201119v1.1

---
 .../resources/mapper_dao/CompeteScoreDao.xml    | 17 +++++++++--------
 .../tall/service/ProTaskDetailService.java      |  4 ++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml
index d920ffd4..36f57298 100644
--- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml
+++ b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml
@@ -106,15 +106,16 @@
   </select>
     <select id="queryCountScoreAll" resultType="com.ccsens.mt.bean.vo.ScoreVo$CountScoreCurrentSite">
         SELECT
-        g.group_name,
-        c.`name`,
-        p.`name`,
-        s.judgment_a_score,
-        s.judgment_b_score2,
-        s.should_times,
+        g.group_name as groupName,
+        c.`name` as companyName,
+        p.`name` as name,
+        s.judgment_a_score as mainOneScore,
+        s.judgment_b_score2 as mainTwoScore,
+        s.should_times as shouldScore,
+        s.chief_judgment_score as mainScore,
         (s.judgment_a_score + s.judgment_b_score2) / 2,
-        s.deduct_times,
-        s.final_score
+        s.deduct_times as deductTime,
+        s.final_score as finalScore
         FROM
         t_compete_start_order o
         LEFT JOIN t_compete_project_player pp on o.player_id = pp.id and pp.rec_status = 0
diff --git a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java
index fbe80a26..f0c819e2 100644
--- a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java
+++ b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java
@@ -321,7 +321,8 @@ public class ProTaskDetailService implements IProTaskDetailService {
 
         }
 
-        //2.业务层分页
+
+        TaskVo.PageInfo pageInfo = new TaskVo.PageInfo(); //2.业务层分页
         List<TaskVo.NormalTask> theNormalTaskList = null;
         int totalPages = 1;
         if (CollectionUtil.isNotEmpty(normalTaskList)) {
@@ -351,7 +352,6 @@ public class ProTaskDetailService implements IProTaskDetailService {
             }
         }
 
-        TaskVo.PageInfo pageInfo = new TaskVo.PageInfo();
         pageInfo.setTotalPage(totalPages);
         pageInfo.setCurrentPage(page);