diff --git a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java index 455ac85c..e4409e53 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java +++ b/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 getResult (@ApiParam @Validated @RequestBody QueryDto 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"}) diff --git a/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java b/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java index 4f6082f1..10073a4b 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/dto/ScoreDto.java +++ b/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 { diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java index 051b9a19..5c9c52f1 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java +++ b/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 diff --git a/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java b/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java index 97127509..db7437eb 100644 --- a/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java +++ b/mt/src/main/java/com/ccsens/mt/bean/vo/TableVo.java @@ -146,19 +146,19 @@ public class TableVo { public List getNums(){ List nums = new ArrayList<>(); if(CollectionUtil.isNotEmpty(joinNum)){ - if(certificate == 0){ - joinNum.forEach(joinGroupNum -> { - nums.add(joinGroupNum.getNum()); - }); - }else { - int i = 0; - for(JoinGroupNum joinGroupNum : joinNum){ - if(!"/".equalsIgnoreCase(joinGroupNum.getNum())){ - i += Integer.parseInt(joinGroupNum.getNum()); + if (certificate == 0) { + joinNum.forEach(joinGroupNum -> { + nums.add(joinGroupNum.getNum()); + }); + } else { + int i = 0; + for (JoinGroupNum joinGroupNum : joinNum) { + if (!"/".equalsIgnoreCase(joinGroupNum.getNum())) { + i += Integer.parseInt(joinGroupNum.getNum()); + } } + nums.add(String.valueOf(i)); } - nums.add(String.valueOf(i)); - } } return nums; } diff --git a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java index cbdba9a9..be47127c 100644 --- a/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java +++ b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java @@ -97,6 +97,14 @@ public interface CompeteScoreDao { */ List queryVarietyScore(@Param("projectId") Long projectId); + /** + * 查询花样赛某一场的成绩 + * @param projectId 项目ID + * @param siteOrderId 场次ID + * @return 成绩 + */ + CompeteVo.OneScore getVarietyScore(@Param("projectId") Long projectId, @Param("siteOrderId")Long siteOrderId); + List selAllDaiBiaoDui(@Param("identity") byte identity); /** Internal Server Error - ccsenscloud - Gitea: Shan Xi Inference co.,ltd

500


Gitea Version: 1.15.6