Merge branch 'pt' of https://dd.tall.wiki/gitea/ccsens_wiki/ccsenscloud into pt

mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java

@@ -107,5 +107,12 @@ public class CompeteScoreController {
         return JsonResponse.newInstance().ok();
     }
 
-
+    @MustLogin
+    @ApiOperation(value = "速度通级赛", notes = "")
+    @RequestMapping(value = "/speedPass", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<CompeteVo.SpeedPass> speedPass(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.CompeteTimeAndProjectId> params) {
+        log.info("速度通级赛：{}",params);
+        List<CompeteVo.SpeedPass> speedPassList = competeService.speedPass(params.getParam());
+        return JsonResponse.newInstance().ok(speedPassList);
+    }
 }

mt/src/main/java/com/ccsens/mt/bean/dto/CompeteDto.java

@@ -368,5 +368,16 @@ public class CompeteDto {
         private BigDecimal finalScore;
     }
 
+    @Data
+    @ApiModel
+    public static class CompeteTimeAndProjectId{
+        @NotNull
+        @ApiModelProperty("第几届信息的id")
+        private Long competeTimeId;
+        @NotNull
+        @ApiModelProperty("项目id")
+        private Long projectId;
+    }
+
 
 }

mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java

@@ -517,4 +517,29 @@ public class CompeteVo {
         @ApiModelProperty("成绩")
         private Long grade;
     }
+
+    @Data
+    @ApiModel("速度通级赛")
+    public static class SpeedPass{
+        @ApiModelProperty("参赛队伍")
+        private String companyName;
+        @ApiModelProperty("组别")
+        private String groupName;
+        @ApiModelProperty("姓名")
+        private String playerName;
+        @ApiModelProperty("30秒单摇跳（次）")
+        private BigDecimal secondTime;
+        @ApiModelProperty("3分钟单摇跳（次）")
+        private BigDecimal minuteTime;
+        @ApiModelProperty("30秒单摇跳等级")
+        private int secondGrade;
+        @ApiModelProperty("3分钟单摇跳等级")
+        private int minuteGrade;
+        @ApiModelProperty("3分钟单摇跳等级")
+        private int grade;
+        @ApiModelProperty("玩家id")
+        private Long playerId;
+        @ApiModelProperty("项目id")
+        private Long projectId;
+    }
 }

mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java

@@ -166,10 +166,17 @@ public class TableVo {
         }
 
         public Long getStartTime(){
-            return startTime == 0 ? null : startTime;
+            if (startTime != null) {
+                return startTime == 0 ? null : startTime;
+            }
+            return  null;
         }
         public Long getEndTime(){
-            return endTime == 0 ? null : endTime;
+            if (endTime != null) {
+                return endTime == 0 ? null : endTime;
+            }
+            return  null;
+
         }
         public int getTimeSum(){
             if(duration != 0 && games != 0) {

mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java

@@ -22,6 +22,9 @@ public interface CompeteScoreDao  {
     List<ScoreVo.CompeteScore> selectSingleVarity(@Param("projectId") long projectId,@Param("competeGroupId") long competeGroupId);
     List<ScoreVo.CompeteScore> selectGroupVarity (@Param("projectId") long projectId,@Param("competeGroupId") long competeGroupId);
     List<ScoreVo.CountScoreCurrentSite> selectCountScoreCurrentSite (@Param("siteId") long siteId);
+    List<CompeteVo.SpeedPass> selectByProjectIdAndPid(@Param("projectId") long projectId,@Param("competeTimeId") long competeTimeId);
+
+
 
 
     /**

mt/src/main/java/com/ccsens/mt/service/CompeteService.java

@@ -22,6 +22,11 @@ import com.ccsens.util.*;
 import com.ccsens.util.bean.dto.QueryDto;
 import com.ccsens.util.exception.BaseException;
 import lombok.extern.slf4j.Slf4j;
+
+import org.apache.poi.ss.usermodel.BuiltinFormats;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellType;
+
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
@@ -1251,6 +1256,116 @@ public class CompeteService implements ICompeteService {
         competeCountScoreMapper.insert(competeCountScore);
     }
 
+    @Override
+
+    public List<CompeteVo.SpeedPass> speedPass(CompeteDto.CompeteTimeAndProjectId params) {
+        long projectId = params.getProjectId();
+        long competeTimeId = params.getCompeteTimeId();
+        List<CompeteVo.SpeedPass> speedPassList = competeScoreDao.selectByProjectIdAndPid(projectId, competeTimeId);
+        if (CollectionUtil.isNotEmpty(speedPassList)) {
+            for (CompeteVo.SpeedPass mes : speedPassList) {
+                //查30s单摇跳得分
+                CompeteStartOrderExample competeStartOrderExample = new CompeteStartOrderExample();
+                competeStartOrderExample.createCriteria().andPlayerIdEqualTo(Constant.SINGLE_ROLL_30_S).andPlayerIdEqualTo(mes.getPlayerId());
+                List<CompeteStartOrder> competeStartOrders = competeStartOrderMapper.selectByExample(competeStartOrderExample);
+                if (competeStartOrders.size() > 0) {
+                    CompeteStartOrder competeStartOrder = competeStartOrders.get(0);
+                    long id = competeStartOrder.getId();
+                    CompeteCountScoreExample competeCountScoreExample = new CompeteCountScoreExample();
+                    competeCountScoreExample.createCriteria().andSiteOrderIdEqualTo(id);
+                    List<CompeteCountScore> competeCountScoreList = competeCountScoreMapper.selectByExample(competeCountScoreExample);
+                    CompeteCountScore competeCountScore = competeCountScoreList.get(0);
+                    BigDecimal score = competeCountScore.getFinalScore();
+                    BigDecimal bigDecimal = new BigDecimal(2);
+                    BigDecimal secondTimeScore = score.multiply(bigDecimal);
+                    //查30s单摇跳得分 * 2 =次数
+                    mes.setSecondTime(secondTimeScore);
+                }
+                //3分钟单摇跳得分
+                CompeteStartOrderExample competeStartOrderExample1 = new CompeteStartOrderExample();
+                competeStartOrderExample.createCriteria().andPlayerIdEqualTo(Constant.SINGLE_ROLL_3_M).andPlayerIdEqualTo(mes.getPlayerId());
+                List<CompeteStartOrder> competeStartOrders1 = competeStartOrderMapper.selectByExample(competeStartOrderExample);
+                if (competeStartOrders1.size() > 0) {
+                    CompeteStartOrder competeStartOrder1 = competeStartOrders.get(0);
+                    long id1 = competeStartOrder1.getId();
+                    CompeteCountScoreExample competeCountScoreExample1 = new CompeteCountScoreExample();
+                    competeCountScoreExample1.createCriteria().andSiteOrderIdEqualTo(id1);
+                    List<CompeteCountScore> competeCountScoreList1 = competeCountScoreMapper.selectByExample(competeCountScoreExample1);
+                    CompeteCountScore competeCountScore1 = competeCountScoreList1.get(0);
+                    BigDecimal score1 = competeCountScore1.getFinalScore();
+                    BigDecimal bigDecimal1 = new BigDecimal(2);
+                    BigDecimal minuteTimeScore = score1.multiply(bigDecimal1);
+                    //3分钟单摇跳得分 * 2 =次数
+                    mes.setMinuteTime(minuteTimeScore);
+                }
+                BigDecimal bigDecimal0 = new BigDecimal(70);
+                BigDecimal bigDecimal2 = new BigDecimal(90);
+                BigDecimal bigDecimal3 = new BigDecimal(105);
+                BigDecimal bigDecimal4 = new BigDecimal(120);
+                BigDecimal bigDecimal5 = new BigDecimal(130);
+                BigDecimal bigDecimal6 = new BigDecimal(140);
+                BigDecimal bigDecimal7 = new BigDecimal(300);
+                BigDecimal bigDecimal8 = new BigDecimal(380);
+                BigDecimal bigDecimal9 = new BigDecimal(460);
+                BigDecimal bigDecimal10 = new BigDecimal(540);
+                BigDecimal bigDecimal11 = new BigDecimal(620);
+                BigDecimal bigDecimal12 = new BigDecimal(700);
+                BigDecimal s =mes.getSecondTime();
+                if (mes.getSecondTime()!= null && mes.getMinuteTime()!= null) {
+                    //判断30s单摇跳等级
+                    if (mes.getSecondTime().compareTo(bigDecimal0) < 1) {
+                        mes.setSecondGrade(1);
+                    }
+                    if (mes.getSecondTime().compareTo(bigDecimal2) < 1) {
+                        mes.setSecondGrade(2);
+                    }
+                    if (mes.getSecondTime().compareTo(bigDecimal3) < 1) {
+                        mes.setSecondGrade(3);
+                    }
+                    if (mes.getSecondTime().compareTo(bigDecimal4) < 1) {
+                        mes.setSecondGrade(4);
+                    }
+                    if (mes.getSecondTime().compareTo(bigDecimal5) < 1) {
+                        mes.setSecondGrade(5);
+                    }
+                    if (mes.getSecondTime().compareTo(bigDecimal6) < 1) {
+                        mes.setSecondGrade(6);
+                    }
+                    //判断3分钟单摇跳等级
+                    if (mes.getMinuteTime().compareTo(bigDecimal7) < 1) {
+                        mes.setMinuteGrade(1);
+                    }
+                    if (mes.getMinuteTime().compareTo(bigDecimal8) < 1) {
+                        mes.setMinuteGrade(2);
+                    }
+
+                    if (mes.getMinuteTime().compareTo(bigDecimal9) < 1) {
+                        mes.setMinuteGrade(3);
+                    }
+
+                    if (mes.getMinuteTime().compareTo(bigDecimal10) < 1) {
+                        mes.setMinuteGrade(4);
+                    }
+
+                    if (mes.getMinuteTime().compareTo(bigDecimal11) < 1) {
+                        mes.setMinuteGrade(5);
+                    }
+
+                    if (mes.getMinuteTime().compareTo(bigDecimal12) < 1) {
+                        mes.setMinuteGrade(6);
+                    }
+                    //如果30s得等级小于等于3分钟得等级
+                    if (mes.getSecondGrade() <= mes.getMinuteGrade()) {
+                        mes.setGrade(mes.getSecondGrade());
+                    } else {
+                        mes.setGrade(mes.getMinuteGrade());
+                    }
+                }
+            }
+        }
+        return speedPassList;
+    }
+
     @Override
     public List<ScoreVo.CountScoreCurrentSite> queryCountScoreAll(ScoreDto.ShowResult param) {
         List<ScoreVo.CountScoreCurrentSite> countScoreCurrentSiteList = new ArrayList<>();
@@ -1264,4 +1379,5 @@ public class CompeteService implements ICompeteService {
         }
         return countScoreCurrentSiteList;
     }
+
 }

mt/src/main/java/com/ccsens/mt/service/ICompeteService.java

@@ -188,11 +188,21 @@ public interface ICompeteService {
 
 
     /**
-     * 查看技术赛成绩公示表
-     * @param param
-     * @return
+<<<<<<< HEAD
+     * 速度通级赛
+     * @param params 项目id和场次id
+     * @return 返回项目，开始时间和比赛状态
      */
+    List<CompeteVo.SpeedPass> speedPass(CompeteDto.CompeteTimeAndProjectId params);
+
+
+/**
+    查看技术赛成绩公示表
+    @param param
+    @return
+    */
     List<ScoreVo.CountScoreCurrentSite> queryCountScoreAll(ScoreDto.ShowResult param);
+
 }
 
 

mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml

@@ -66,7 +66,7 @@
       LEFT JOIN (
       SELECT
       id,
-      if(FROM_UNIXTIME(start_time/1000,'%h') <= 5,1 ,0) as aa
+      if(FROM_UNIXTIME(start_time/1000,'%h') <= 12,1 ,0) as aa
       FROM
       t_compete_project_config
       )a on c.id = a.id

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
@@ -155,5 +156,26 @@
         ORDER BY s.final_score DESC
   </select>
 
+  <select id="selectByProjectIdAndPid" resultType="com.ccsens.mt.bean.vo.CompeteVo$SpeedPass" parameterType="java.util.Map">
+    select
+    tcg.group_name AS groupName,
+    tcp.`name` as playName,
+    tcc.`name` as companyName,
+    tccp.player_id as playerId,
+    tccp.project_id as projectId
+
+    from
+    t_compete_project_player tccp
+    LEFT JOIN t_compete_player tcp on tccp.player_id = tcp.id
+    LEFT JOIN t_compete_company tcc on tcc.id = tcp.company_id
+    LEFT JOIN t_compete_group tcg on tcg.id = tcp.compete_group_id
+    WHERE tccp.compete_time_id = #{competeTimeId}
+    and tccp.project_id =#{projectId}
+    and tccp.rec_status=0
+    and tcp.rec_status=0
+    and tcc.rec_status=0
+    and tcg.rec_status=0
+  </select>
+
 
 </mapper>

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