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

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

@@ -8,6 +8,7 @@ import com.ccsens.mt.bean.vo.ScoreVo;
 import com.ccsens.mt.service.ICompeteService;
 import com.ccsens.util.JsonResponse;
 import com.ccsens.util.bean.dto.QueryDto;
+import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
@@ -105,7 +106,7 @@ public class CompeteScoreController {
     @RequestMapping(value = "/query/countScoreAll", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<ScoreVo.CountScoreCurrentSite> queryCountScoreAll(@ApiParam @Validated @RequestBody QueryDto<ScoreDto.ShowResult> params) {
         log.info("查看计数赛成绩公示表：{}",params);
-        List<ScoreVo.CountScoreCurrentSite> countScoreCurrentSites = competeService.queryCountScoreAll(params.getParam());
+        PageInfo<ScoreVo.CountScoreCurrentSite> countScoreCurrentSites = competeService.queryCountScoreAll(params.getParam());
         log.info("查看计数赛成绩公示表：{}",params);
         return JsonResponse.newInstance().ok(countScoreCurrentSites);
     }
@@ -124,7 +125,7 @@ public class CompeteScoreController {
     @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());
+        PageInfo<CompeteVo.SpeedPass> speedPassList = competeService.speedPass(params.getParam());
         return JsonResponse.newInstance().ok(speedPassList);
     }
 

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

@@ -9,6 +9,7 @@ import com.ccsens.mt.bean.vo.TableVo;
 import com.ccsens.mt.service.IExcelService;
 import com.ccsens.util.JsonResponse;
 import com.ccsens.util.bean.dto.QueryDto;
+import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -111,7 +112,7 @@ public class ExcelController {
     @RequestMapping(value = "/enterInfo", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<TableVo.CompeteJoin> getEnterInfo(@ApiParam @Validated @RequestBody QueryDto<CompeteDto.EnterInfo> params) {
         log.info("日程安排更新：{}",params);
-        List<TableVo.CompeteJoin> competeJoinList = excelService.getCompeteJoinDetail(params.getParam());
+        PageInfo<TableVo.CompeteJoin> competeJoinList = excelService.getCompeteJoinDetail(params.getParam());
         return JsonResponse.newInstance().ok(competeJoinList);
     }
 

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

@@ -379,6 +379,10 @@ public class CompeteDto {
         @NotNull
         @ApiModelProperty("项目id")
         private Long projectId;
+        @ApiModelProperty("当前页")
+        private int page=1;
+        @ApiModelProperty("每页数量")
+        private  int size=10;
     }
 
     @Data

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

@@ -129,6 +129,10 @@ public class ScoreDto {
         @NotNull
         @ApiModelProperty("项目id")
         private Long projectId;
+        @ApiModelProperty("当前页")
+        private int page=1;
+        @ApiModelProperty("每页数量")
+        private  int size=10;
     }
     @Data
     @ApiModel

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

@@ -24,6 +24,9 @@ public interface CompeteScoreDao  {
     List<ScoreVo.CountScoreCurrentSite> selectCountScoreCurrentSite (@Param("siteId") long siteId);
     List<CompeteVo.SpeedPass> selectByProjectIdAndPid(@Param("projectId") long projectId,@Param("competeTimeId") long competeTimeId);
 
+    List<ScoreVo.CountScoreCurrentSite> selectQueryCountScore(@Param("projectId")Long projectId);
+
+
 
 
 

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

@@ -22,6 +22,8 @@ import com.ccsens.mt.util.Constant;
 import com.ccsens.util.*;
 import com.ccsens.util.bean.dto.QueryDto;
 import com.ccsens.util.exception.BaseException;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 
 import org.apache.commons.lang.StringUtils;
@@ -1345,10 +1347,12 @@ public class CompeteService implements ICompeteService {
 
     @Override
 
-    public List<CompeteVo.SpeedPass> speedPass(CompeteDto.CompeteTimeAndProjectId params) {
+    public PageInfo<CompeteVo.SpeedPass> speedPass(CompeteDto.CompeteTimeAndProjectId params) {
         long projectId = params.getProjectId();
         long competeTimeId = params.getCompeteTimeId();
+        PageHelper.startPage(params.getPage(),params.getSize());
         List<CompeteVo.SpeedPass> speedPassList = competeScoreDao.selectByProjectIdAndPid(projectId, competeTimeId);
+        PageInfo pageInfo = new PageInfo<>(speedPassList);
         if (CollectionUtil.isNotEmpty(speedPassList)) {
             for (CompeteVo.SpeedPass mes : speedPassList) {
                 //查30s单摇跳得分
@@ -1450,23 +1454,135 @@ public class CompeteService implements ICompeteService {
                 }
             }
         }
-        return speedPassList;
+        return pageInfo;
     }
 
+    public List<CompeteVo.SpeedPass> speedPassCha(CompeteDto.CompeteTimeAndProjectId params) {
+        long projectId = params.getProjectId();
+        long competeTimeId = params.getCompeteTimeId();
+        PageHelper.startPage(params.getPage(),params.getSize());
+        List<CompeteVo.SpeedPass> speedPassList = competeScoreDao.selectByProjectIdAndPid(projectId, competeTimeId);
+        PageInfo pageInfo = new PageInfo<>(speedPassList);
+        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);
+                    }
 
-    @Override
-    public List<ScoreVo.CountScoreCurrentSite> queryCountScoreAll(ScoreDto.ShowResult param) {
-        List<ScoreVo.CountScoreCurrentSite> countScoreCurrentSiteList = new ArrayList<>();
-        CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId());
-        if(ObjectUtil.isNotNull(competeProject)) {
-            if(competeProject.getTeam() == 0) {
-                countScoreCurrentSiteList = competeScoreDao.queryCountScoreAll(param.getProjectId());
-            }else {
-                countScoreCurrentSiteList = competeScoreDao.queryCountScoreAllByTeam(param.getProjectId());
+                    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 countScoreCurrentSiteList;
+        return speedPassList;
+    }
+
+    @Override
+    public PageInfo<ScoreVo.CountScoreCurrentSite> queryCountScoreAll(ScoreDto.ShowResult params) {
+        PageHelper.startPage(params.getPage(),params.getSize());
+        List<ScoreVo.CountScoreCurrentSite> countScoreCurrentSites = competeScoreDao.selectQueryCountScore(params.getProjectId());
+        PageInfo pageInfo = new PageInfo<>(countScoreCurrentSites);
+//        List<ScoreVo.CountScoreCurrentSite> countScoreCurrentSiteList = new ArrayList<>();
+//        CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(param.getProjectId());
+
+//        if(ObjectUtil.isNotNull(competeProject)) {
+//            if(competeProject.getTeam() == 0) {
+//                countScoreCurrentSiteList = competeScoreDao.queryCountScoreAll(param.getProjectId());
+//            }else {
+//                countScoreCurrentSiteList = competeScoreDao.queryCountScoreAllByTeam(param.getProjectId());
+//            }
+//        }
+        return pageInfo;
     }
 
     @Override
@@ -1598,7 +1714,7 @@ public class CompeteService implements ICompeteService {
 
     @Override
     public String speedPassOut(CompeteDto.CompeteTimeAndProjectId params) throws IOException {
-        List<CompeteVo.SpeedPass> speedPasses = speedPass(params);
+        List<CompeteVo.SpeedPass> speedPasses = speedPassCha(params);
         String path = getExcelFilePathForspeedPassOut(speedPasses);
         return path;
     }

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

@@ -1150,7 +1150,7 @@ public class ExcelService implements IExcelService {
 
 
     @Override
-    public List<TableVo.CompeteJoin> getCompeteJoinDetail(CompeteDto.EnterInfo params) {
+    public PageInfo<TableVo.CompeteJoin> getCompeteJoinDetail(CompeteDto.EnterInfo params) {
 //          List<TableVo.CompeteJoin> competeJoinList = new ArrayList<>();
 //          个人项目查询
 //        PageHelper.startPage(params.getPage(),params.getSize());
@@ -1167,7 +1167,7 @@ public class ExcelService implements IExcelService {
         PageHelper.startPage(params.getPage(),params.getSize());
         List<TableVo.CompeteJoin> competeJoinList = competeProjectConfigDao.selectPeople(params.getProjectId(), params.getGroupId(), params.getCompanyId(), params.getName(), params.getIdCard());
         PageInfo pageInfo = new PageInfo<>(competeJoinList);
-        return  competeJoinList;
+        return  pageInfo;
     }
 
     @Override

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

@@ -5,6 +5,7 @@ import com.ccsens.mt.bean.dto.ScoreDto;
 import com.ccsens.mt.bean.vo.CompeteVo;
 import com.ccsens.mt.bean.vo.ScoreVo;
 import com.ccsens.util.bean.dto.QueryDto;
+import com.github.pagehelper.PageInfo;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -193,7 +194,7 @@ public interface ICompeteService {
      * @param params 项目id和场次id
      * @return 返回项目，开始时间和比赛状态
      */
-    List<CompeteVo.SpeedPass> speedPass(CompeteDto.CompeteTimeAndProjectId params);
+    PageInfo<CompeteVo.SpeedPass> speedPass(CompeteDto.CompeteTimeAndProjectId params);
 
 
     /**
@@ -209,7 +210,7 @@ public interface ICompeteService {
     @param param
     @return
     */
-    List<ScoreVo.CountScoreCurrentSite> queryCountScoreAll(ScoreDto.ShowResult param);
+    PageInfo<ScoreVo.CountScoreCurrentSite> queryCountScoreAll(ScoreDto.ShowResult param);
 
     CompeteVo.SelScropeVo selSubmitOrderList(ScoreDto.SelScrop param);
 

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

@@ -7,6 +7,7 @@ import com.ccsens.mt.bean.vo.TableVo;
 import com.ccsens.util.bean.dto.QueryDto;
 import com.ccsens.mt.bean.dto.CompeteDto;
 import com.ccsens.util.bean.dto.QueryDto;
+import com.github.pagehelper.PageInfo;
 
 import java.io.IOException;
 import java.util.List;
@@ -43,7 +44,7 @@ public interface IExcelService {
      * @param  params 大赛id
      * @return 返回失败的信息
      */
-    List<TableVo.CompeteJoin> getCompeteJoinDetail(CompeteDto.EnterInfo params);
+    PageInfo<TableVo.CompeteJoin> getCompeteJoinDetail(CompeteDto.EnterInfo params);
 
 
     /**

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

@@ -104,6 +104,64 @@
     and tccs.rec_status =0
     and tcso.id =#{siteId}
   </select>
+
+
+    <select id="selectQueryCountScore" resultType="com.ccsens.mt.bean.vo.ScoreVo$CountScoreCurrentSite" parameterType="java.util.Map">
+        SELECT @rownum:=@rownum+1 as rangee, b.* from (
+        SELECT
+        g.group_name as groupName ,
+        c.`name` companyName,
+        GROUP_CONCAT(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 as deductTime,
+        s.final_score as finalScore
+        FROM
+        t_compete_start_order o
+        LEFT JOIN t_compete_team t on o.player_id = t.id and t.rec_status = 0
+        LEFT JOIN t_compete_team_member m on m.compete_team_id = t.id and m.rec_status = 0
+        LEFT JOIN t_compete_player p on m.player_id = p.id and p.rec_status = 0
+        LEFT JOIN t_compete_company c on c.id = t.company_id and c.rec_status = 0
+        LEFT JOIN t_compete_group g on t.group_remark = g.group_remark and t.gender_group = g.sex
+        LEFT JOIN t_compete_count_score s on s.site_order_id = o.id and s.rec_status = 0
+        WHERE
+        o.project_id = #{projectId}
+        and
+        o.rec_status = 0
+        GROUP BY o.id
+        ORDER BY s.final_score DESC) b,(select @rownum:=0) a
+        UNION
+        SELECT @rownum:=@rownum+1 as rangee, b.* from (
+        SELECT
+        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 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
+        LEFT JOIN t_compete_player p on pp.player_id = p.id and p.rec_status = 0
+        LEFT JOIN t_compete_company c on c.id = p.company_id and c.rec_status = 0
+        LEFT JOIN t_compete_group g on p.compete_group_id = g.id
+        LEFT JOIN t_compete_count_score s on s.site_order_id = o.id and s.rec_status = 0
+        WHERE
+        o.project_id = #{projectId}
+        and o.rec_status = 0
+        ORDER BY s.final_score DESC) b,(select @rownum:=0) a
+    </select>
+
+
+
+
     <select id="queryCountScoreAll" resultType="com.ccsens.mt.bean.vo.ScoreVo$CountScoreCurrentSite">
         SELECT @rownum:=@rownum+1 as rangee, b.* from (
         SELECT