20201119v1.1

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,
+        g.group_name as groupName,
-        c.`name`,
+        c.`name` as companyName,
-        p.`name`,
+        p.`name` as name,
-        s.judgment_a_score,
+        s.judgment_a_score as mainOneScore,
-        s.judgment_b_score2,
+        s.judgment_b_score2 as mainTwoScore,
-        s.should_times,
+        s.should_times as shouldScore,
+        s.chief_judgment_score as mainScore,
         (s.judgment_a_score + s.judgment_b_score2) / 2,
-        s.deduct_times,
+        s.deduct_times as deductTime,
-        s.final_score
+        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

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);