From f828f64ba06d2b5a5ea50d5c25ca4db4ca19e2da Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Sat, 21 Nov 2020 19:16:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mt/src/main/java/com/ccsens/mt/service/CompeteService.java | 1 + 1 file changed, 1 insertion(+) 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 41efae93..1a468fa6 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -109,6 +109,7 @@ public class CompeteService implements ICompeteService { PageHelper.startPage(param.getPageNum(),param.getPageSize()); List totalScoreDisplaysList=new ArrayList<>(); CompeteStartOrderExample competeStartOrderExample =new CompeteStartOrderExample(); + competeStartOrderExample.setOrderByClause("player_id DESC"); competeStartOrderExample.createCriteria().andProjectIdEqualTo(param.getProjectId()).andRecStatusEqualTo((byte) 0); List competeStartOrdersList = competeStartOrderMapper.selectByExample(competeStartOrderExample); if(competeStartOrdersList.size()<1){ From 1abe7ec4b7e53ed387202725067dcf587955cdec Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Sat, 21 Nov 2020 19:18:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mt/src/main/java/com/ccsens/mt/service/CompeteService.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 1a468fa6..e68b7248 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -109,8 +109,9 @@ public class CompeteService implements ICompeteService { PageHelper.startPage(param.getPageNum(),param.getPageSize()); List totalScoreDisplaysList=new ArrayList<>(); CompeteStartOrderExample competeStartOrderExample =new CompeteStartOrderExample(); - competeStartOrderExample.setOrderByClause("player_id DESC"); + competeStartOrderExample.createCriteria().andProjectIdEqualTo(param.getProjectId()).andRecStatusEqualTo((byte) 0); + competeStartOrderExample.setOrderByClause("player_id DESC"); List competeStartOrdersList = competeStartOrderMapper.selectByExample(competeStartOrderExample); if(competeStartOrdersList.size()<1){ throw new BaseException(CodeEnum.PARAM_ERROR); @@ -215,7 +216,11 @@ public class CompeteService implements ICompeteService { List totalScoreDisplaysList=new ArrayList<>(); CompeteStartOrderExample competeStartOrderExample =new CompeteStartOrderExample(); competeStartOrderExample.createCriteria().andProjectIdEqualTo(param.getProjectId()); + competeStartOrderExample.setOrderByClause("player_id DESC"); List competeStartOrdersList = competeStartOrderMapper.selectByExample(competeStartOrderExample); + if(competeStartOrdersList.size()<1){ + throw new BaseException(CodeEnum.PARAM_ERROR); + } competeStartOrdersList.forEach(competeStartOrder -> { //一个人或者一个团队得数据 CompeteVo.TotalScoreDisplay totalScoreDisplay = new CompeteVo.TotalScoreDisplay(); From ae38b4581be3f7c147c488d21452d3bef0a25d31 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Sat, 21 Nov 2020 21:49:51 +0800 Subject: [PATCH 3/3] xiuigai --- .../ccsens/mt/api/CompeteScoreController.java | 4 +- .../com/ccsens/mt/service/CompeteService.java | 43 ++++++------------- 2 files changed, 16 insertions(+), 31 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 dea568c2..dbd34fff 100644 --- a/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java +++ b/mt/src/main/java/com/ccsens/mt/api/CompeteScoreController.java @@ -66,9 +66,9 @@ public class CompeteScoreController { @ApiOperation(value = "花样赛成绩查看", notes = "Mr.王 -----从花样赛成绩表里面查看出这个人得成绩") @RequestMapping(value = "/showResult", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) - public JsonResponse> showResult (@ApiParam @Validated @RequestBody QueryDto params){ + public JsonResponse> showResult (@ApiParam @Validated @RequestBody QueryDto params){ log.info("花样赛详细分数查看：{}",params); - PageInfo totalScoreDisplaysList= competeService.showResultPage(params.getParam()); + List totalScoreDisplaysList= competeService.showResult(params.getParam()); return JsonResponse.newInstance().ok(totalScoreDisplaysList); } 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 e68b7248..4b00b528 100644 --- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java +++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java @@ -218,9 +218,9 @@ public class CompeteService implements ICompeteService { competeStartOrderExample.createCriteria().andProjectIdEqualTo(param.getProjectId()); competeStartOrderExample.setOrderByClause("player_id DESC"); List competeStartOrdersList = competeStartOrderMapper.selectByExample(competeStartOrderExample); - if(competeStartOrdersList.size()<1){ - throw new BaseException(CodeEnum.PARAM_ERROR); - } +// if(competeStartOrdersList.size()<1){ +// throw new BaseException(CodeEnum.PARAM_ERROR); +// } competeStartOrdersList.forEach(competeStartOrder -> { //一个人或者一个团队得数据 CompeteVo.TotalScoreDisplay totalScoreDisplay = new CompeteVo.TotalScoreDisplay(); @@ -1150,30 +1150,6 @@ public class CompeteService implements ICompeteService { CompeteJudgment competeJudgment = competeJudgmentMapper.selectByPrimaryKey(param.getJudgmentId()); CompeteStartOrder competeStartOrder1 = competeStartOrderMapper.selectByPrimaryKey(param.getSiteOrderId()); if(competeJudgment.getChiefJudgment()!=(byte)0){ - //不是主裁判 - //先判断主裁判提交了没 -// Integer ti= new Integer(0);//0代表没提交 1代表提交了 -// CompeteVarietyScoreExample competeVarietyScoreExample=new CompeteVarietyScoreExample(); -// competeVarietyScoreExample.createCriteria().andSiteOrderIdEqualTo(param.getSiteOrderId()).andRecStatusEqualTo((byte) 0); -// List competeVarietyScoresList = competeVarietyScoreMapper.selectByExample(competeVarietyScoreExample); -// //下面就是想看看主裁判提交了没 -// if(competeVarietyScoresList.size()>0){ -// for (CompeteVarietyScore competeVarietyScore:competeVarietyScoresList){ -// CompeteJudgment competeJudgment1 = competeJudgmentMapper.selectByPrimaryKey(competeVarietyScore.getJudgmentId()); -// if(competeJudgment1.getChiefJudgment()==(byte)0){ -// ti=1; -// break; -// } -// } -// } -// if(ti>0){ -// //主裁判提交了，则看一下他里面是否选择了弃权 -// if(competeStartOrder1.getWaiver()!=(byte)0){ -// for(int j=0;j competeVarietyScores = competeVarietyScoreMapper.selectByExample(competeVarietyScoreExample); + if(competeVarietyScores.size()>0){ + competeVarietyScore.setId(competeVarietyScores.get(0).getId()); + competeVarietyScoreMapper.updateByPrimaryKeySelective(competeVarietyScore); + }else { + competeVarietyScore.setId(snowflake.nextId()); + competeVarietyScoreMapper.insertSelective(competeVarietyScore); + } }); }