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

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

@@ -75,6 +75,14 @@ public class CompeteScoreController {
         return JsonResponse.newInstance().ok(totalScoreDisplaysList);
     }
 
+    @ApiOperation(value = "查看花样赛某一场次的成绩", notes = "whj -----查看花样赛某一场次的成绩")
+    @RequestMapping(value = "/getResult", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
+    public JsonResponse<CompeteVo.OneScore> getResult (@ApiParam @Validated @RequestBody QueryDto<ScoreDto.OneScore> params){
+        log.info("花样赛详细分数查看：{}",params);
+        CompeteVo.OneScore score= competeService.getResult(params.getParam());
+        return JsonResponse.newInstance().ok(score);
+    }
+
 
     @ApiOperation(value = "项目状态", notes = "")
     @RequestMapping(value = "/countScore", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})

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

@@ -165,6 +165,17 @@ public class ScoreDto {
         @Max(value=100)
         private int pageSize = 10;
     }
+    @Data
+    @ApiModel("某一场次的成绩查询-请求")
+    public static class OneScore {
+        @NotNull
+        @ApiModelProperty("项目id")
+        private Long projectId;
+        @ApiModelProperty("场次ID")
+        @NotNull
+        private Long siteOrderId;
+    }
+
     @Data
     @ApiModel
     public static class ShowResultNoPage {

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

@@ -497,7 +497,37 @@ public class CompeteVo {
 //        @ApiModelProperty("排名")
 //        public int order;
         @ApiModelProperty("备注")
-        public Byte remark;
+        public String remark;
+    }
+
+    @ApiModel("某一场次的成绩查询-响应")
+    public static class OneScore{
+        @ApiModelProperty("单位名")
+        public String companyName;
+        @ApiModelProperty("参赛队员名")
+        public String peopleName;
+        @ApiModelProperty("裁判1")
+        public BigDecimal referee1 = new BigDecimal(0);
+        @ApiModelProperty("裁判2")
+        public BigDecimal referee2 = new BigDecimal(0);
+        @ApiModelProperty("裁判3")
+        public BigDecimal referee3 = new BigDecimal(0);
+        @ApiModelProperty("1-3裁判得平均值")
+        public BigDecimal avg1To3 = new BigDecimal(0);
+        @ApiModelProperty("裁判4")
+        public BigDecimal referee4 = new BigDecimal(0);
+        @ApiModelProperty("裁判5")
+        public BigDecimal referee5 = new BigDecimal(0);
+        @ApiModelProperty("裁判6")
+        public BigDecimal referee6 = new BigDecimal(0);
+        @ApiModelProperty("4-6裁判得平均值")
+        public BigDecimal avg4To6 = new BigDecimal(0);
+        @ApiModelProperty("主裁判")
+        public BigDecimal referee0 = new BigDecimal(0);
+        @ApiModelProperty("最后得分")
+        public BigDecimal result = new BigDecimal(0);
+        @ApiModelProperty("备注")
+        public String remark;
     }
 
     @Data

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

@@ -97,6 +97,14 @@ public interface CompeteScoreDao  {
      */
     List<CompeteVo.TotalScoreDisplay> queryVarietyScore(@Param("projectId") Long projectId);
 
+    /**
+     * 查询花样赛某一场的成绩
+     * @param projectId 项目ID
+     * @param siteOrderId 场次ID
+     * @return 成绩
+     */
+    CompeteVo.OneScore getVarietyScore(@Param("projectId") Long projectId, @Param("siteOrderId")Long siteOrderId);
+
     List<CompeteVo.DaiBiaoDUi> selAllDaiBiaoDui(@Param("identity")  byte  identity);
 
     /**

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

@@ -1858,6 +1858,12 @@ public class CompeteService implements ICompeteService {
         return new PageInfo<>(list);
     }
 
+    @Override
+    public CompeteVo.OneScore getResult(ScoreDto.OneScore param) {
+        CompeteVo.OneScore score = competeScoreDao.getVarietyScore(param.getProjectId(), param.getSiteOrderId());
+        return score;
+    }
+
 
     @Override
     public String speedPassOut(CompeteDto.CompeteTimeAndProjectId params) throws IOException {

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

@@ -1334,11 +1334,12 @@ public class ExcelService implements IExcelService {
                 PoiUtil.PoiUtilCell threeThir=new PoiUtil.PoiUtilCell((StringUtil.valueOf(mes.getResult())),1,1);
                 PoiUtil.PoiUtilCell threeFour=new PoiUtil.PoiUtilCell("",1,1);
                 PoiUtil.PoiUtilCell threeFif=new PoiUtil.PoiUtilCell(WebConstant.CELL_NULL,1,1);
-                if(mes.getRemark()==(byte)1){
-                    threeFif.setValue("弃权");
-                }else {
-                    threeFif.setValue("取消比赛资格");
-                }
+//                if(mes.getRemark()==(byte)1){
+//                    threeFif.setValue("弃权");
+//                }else {
+//                    threeFif.setValue("取消比赛资格");
+//                }
+                threeFif.setValue(mes.getRemark());
                 three.add(threeThree);
                 three.add(threeFive);
                 three.add(threeSix);

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

@@ -221,6 +221,13 @@ public interface ICompeteService {
      * @return 成绩
      */
     PageInfo<ScoreVo.CountScorePublicity> queryCountScore(ScoreDto.ShowResult param);
+
+    /**
+     * 查看花样赛某一场次的成绩
+     * @param param
+     * @return
+     */
+    CompeteVo.OneScore getResult(ScoreDto.OneScore param);
 }
 
 

mt/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: dev
-    include: common, util-dev
+    active: prod
+    include: common, util-prod
 

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

@@ -705,6 +705,7 @@
                 select s.*, c.name as companyName, GROUP_CONCAT(p.name) as peopleName, (ifnull(s.referee1,0)+ifnull(s.referee2,0)+ifnull(s.referee3,0))/3 as avg1To3,
         (ifnull(s.referee4,0)+ifnull(s.referee5,0)+ifnull(s.referee6,0))/3 as avg4To6,
         (ifnull(s.referee1,0)+ifnull(s.referee2,0)+ifnull(s.referee3,0))/3 + (ifnull(s.referee4,0)+ifnull(s.referee5,0)+ifnull(s.referee6,0))/3 - s.referee0 as result,
+        case o.waiver when 1 then '弃权' when 2 then '取消比赛资格' end as remark,
         @rownum := @rownum + 1 AS rownum
         from
         (select site_order_id, max(if(chief_judgment = 0, score, null)) as referee0, max(if(chief_judgment = 1, score, null)) as referee1,
@@ -862,6 +863,28 @@
         ORDER BY
             tt.id
     </select>
+    <select id="getVarietyScore" resultType="com.ccsens.mt.bean.vo.CompeteVo$OneScore">
+        select s.*, c.name as companyName, GROUP_CONCAT(p.name) as peopleName, (ifnull(s.referee1,0)+ifnull(s.referee2,0)+ifnull(s.referee3,0))/3 as avg1To3,
+        (ifnull(s.referee4,0)+ifnull(s.referee5,0)+ifnull(s.referee6,0))/3 as avg4To6,
+        (ifnull(s.referee1,0)+ifnull(s.referee2,0)+ifnull(s.referee3,0))/3 + (ifnull(s.referee4,0)+ifnull(s.referee5,0)+ifnull(s.referee6,0))/3 - s.referee0 as result,
+        case o.waiver  when 1 then '弃权' when 2 then '取消比赛资格' end as remark
+        from
+        (select site_order_id, max(if(chief_judgment = 0, score, null)) as referee0, max(if(chief_judgment = 1, score, null)) as referee1,
+         max(if(chief_judgment = 2, score, null)) as referee2, max(if(chief_judgment = 3, score, null)) as referee3,
+         max(if(chief_judgment = 4, score, null)) as referee4, max(if(chief_judgment = 5, score, null)) as referee5,
+         max(if(chief_judgment = 6, score, null)) as referee6, max(if(chief_judgment = 7, score, null)) as referee7
+        from
+        (select s.site_order_id, j.chief_judgment, sum(s.score) as score from t_compete_variety_score s, t_compete_judgment j where s.judgment_id = j.id and s.project_id = #{projectId} and s.site_order_id = #{siteOrderId} and s.rec_status = 0 and j.rec_status = 0 group by s.site_order_id,j.chief_judgment) t
+        group by t.site_order_id) s,
+        t_compete_start_order o,
+        t_compete_team t,
+        t_compete_team_member m,
+        t_compete_player p,
+        t_compete_company c
+        where s.site_order_id = o.id and o.player_id = t.id and t.id = m.compete_team_id and m.player_id = p.id and p.company_id = c.id
+        and o.rec_status = 0 and t.rec_status = 0 and m.rec_status = 0 and p.rec_status = 0 and c.rec_status = 0
+        group by s.site_order_id
+    </select>
     <resultMap id="selAllOrder" type="com.ccsens.mt.bean.vo.CompeteExcelVo$Project">
         <id column="projectId" property="projectId"></id>
         <result column="projectName" property="projectName" />