From 85a453ddc73871b48bbd04798c74e2fbe0da55e8 Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Wed, 25 Nov 2020 18:28:46 +0800 Subject: [PATCH 1/2] 11 --- .../com/ccsens/mt/service/ExcelService.java | 3 +- mt/src/main/resources/application-dev.yml | 2 + .../mapper_dao/CompeteCompanyDao.xml | 45 +++++++++++++------ 3 files changed, 35 insertions(+), 15 deletions(-) diff --git a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java index ab453062..f844a746 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -617,8 +617,7 @@ public class ExcelService implements IExcelService { @Override - public String - competeJoinCount(CompeteDto.CompeteTime params) throws IOException { + public String competeJoinCount(CompeteDto.CompeteTime params) throws IOException { List competeOverviewList = competeJoinCountList(params); return getExcelFilePathForCompeteJoinCount(competeOverviewList); } diff --git a/mt/src/main/resources/application-dev.yml b/mt/src/main/resources/application-dev.yml index 3121478b..646ecd0c 100644 --- a/mt/src/main/resources/application-dev.yml +++ b/mt/src/main/resources/application-dev.yml @@ -31,3 +31,5 @@ file: signUpUrl: https://test.tall.wiki/compete/ domain: https://test.tall.wiki/gateway/mt/ imgDomain: https://test.tall.wiki/gateway/mt/uploads/ +logging: + path: \ No newline at end of file diff --git a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml index c2ca9ab2..40ee8dff 100644 --- a/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteCompanyDao.xml @@ -401,22 +401,41 @@ \ No newline at end of file From 1c235b421a8d246a0dcb5ce6e9246814d1620b4b Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Wed, 25 Nov 2020 18:38:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=8A=B1=E6=A0=B7=E8=B5=9B=E6=9F=90?= =?UTF-8?q?=E4=B8=80=E5=9C=BA=E6=AC=A1=E7=9A=84=E6=88=90=E7=BB=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccsens/mt/api/CompeteScoreController.java | 8 +++++ .../java/com/ccsens/mt/bean/dto/ScoreDto.java | 11 +++++++ .../java/com/ccsens/mt/bean/vo/CompeteVo.java | 32 ++++++++++++++++++- .../mt/persist/dao/CompeteScoreDao.java | 8 +++++ .../com/ccsens/mt/service/CompeteService.java | 6 ++++ .../com/ccsens/mt/service/ExcelService.java | 11 ++++--- .../ccsens/mt/service/ICompeteService.java | 7 ++++ mt/src/main/resources/application.yml | 4 +-- .../resources/mapper_dao/CompeteScoreDao.xml | 23 +++++++++++++ tall/src/main/resources/application.yml | 4 +-- 10 files changed, 104 insertions(+), 10 deletions(-) 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/persist/dao/CompeteScoreDao.java b/mt/src/main/java/com/ccsens/mt/persist/dao/CompeteScoreDao.java index 98dbefd7..2a9508a1 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); /** diff --git a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java index b1b0847f..5f767e49 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/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 { diff --git a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java index ab453062..75418e76 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ExcelService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ExcelService.java @@ -1450,11 +1450,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); diff --git a/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java b/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java index 758e42df..1051e704 100644 --- a/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/ICompeteService.java @@ -221,6 +221,13 @@ public interface ICompeteService { * @return 成绩 */ PageInfo queryCountScore(ScoreDto.ShowResult param); + + /** + * 查看花样赛某一场次的成绩 + * @param param + * @return + */ + CompeteVo.OneScore getResult(ScoreDto.OneScore param); } diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index b9b264a7..4ecd13fd 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: prod - include: common, util-prod + active: dev + include: common, util-dev diff --git a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml b/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml index c060d25d..b330047b 100644 --- a/mt/src/main/resources/mapper_dao/CompeteScoreDao.xml +++ b/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 +