xiuigai

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<PageInfo<CompeteVo.TotalScoreDisplay>> showResult (@ApiParam @Validated @RequestBody QueryDto<ScoreDto.ShowResultW> params){
+    public JsonResponse<List<CompeteVo.TotalScoreDisplay>> showResult (@ApiParam @Validated @RequestBody QueryDto<ScoreDto.ShowResultW> params){
         log.info("花样赛详细分数查看：{}",params);
-        PageInfo<CompeteVo.TotalScoreDisplay> totalScoreDisplaysList= competeService.showResultPage(params.getParam());
+        List<CompeteVo.TotalScoreDisplay> totalScoreDisplaysList= competeService.showResult(params.getParam());
         return JsonResponse.newInstance().ok(totalScoreDisplaysList);
     }
 

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<CompeteStartOrder> 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<CompeteVarietyScore> 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<param.getFractionsList().size();j++){
-//                        param.getFractionsList().get(j).setScore(new BigDecimal(0));
-//                    }
-//                }
-//            }
             if(competeStartOrder1.getWaiver()!=(byte)0){
                 for(int j=0;j<param.getFractionsList().size();j++){
                     param.getFractionsList().get(j).setScore(new BigDecimal(0));
@@ -1208,15 +1184,24 @@ public class CompeteService implements ICompeteService {
                     param.getFractionsList().get(i).setScore(new BigDecimal(0));
                 }
             }
+
             CompeteVarietyScore competeVarietyScore=new CompeteVarietyScore();
-            competeVarietyScore.setId(snowflake.nextId());
             competeVarietyScore.setCompeteTimeId(param.getCompeteTimeId());
             competeVarietyScore.setProjectId(param.getProjectId());
             competeVarietyScore.setSiteOrderId(param.getSiteOrderId());
             competeVarietyScore.setCode(mes.getCode());
             competeVarietyScore.setScore(mes.getScore());
             competeVarietyScore.setJudgmentId(param.getJudgmentId());
-            competeVarietyScoreMapper.insertSelective(competeVarietyScore);
+            CompeteVarietyScoreExample competeVarietyScoreExample=new CompeteVarietyScoreExample();
+            competeVarietyScoreExample.createCriteria().andSiteOrderIdEqualTo(competeVarietyScore.getSiteOrderId()).andJudgmentIdEqualTo(competeVarietyScore.getJudgmentId()).andCodeEqualTo(competeVarietyScore.getCode()).andRecStatusEqualTo((byte)0);
+            List<CompeteVarietyScore> 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);
+            }
         });
 
     }