修改查询花样赛成绩

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

@@ -519,6 +519,8 @@ public class CompeteVo {
         private Byte site;
         @ApiModelProperty("备注")
         private String remark;
+        @ApiModelProperty("是否弃权")
+        private Byte waiver;
         @ApiModelProperty("分数合集")
         private List<ScropList> scoreList;
     }

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

@@ -1465,6 +1465,7 @@ public class CompeteService implements ICompeteService {
 
         //场次表里面的东西
         CompeteStartOrder competeStartOrder1 = competeStartOrderMapper.selectByPrimaryKey(param.getSiteOrderId());
+        selScropeVo.setWaiver(competeStartOrder1.getWaiver());
         //项目表里面的东西
         CompeteProject competeProject = competeProjectMapper.selectByPrimaryKey(competeStartOrder1.getProjectId());
         //项目名称
@@ -1541,8 +1542,11 @@ public class CompeteService implements ICompeteService {
             String name= String.valueOf(names.substring(0,names.length()-2));
             selScropeVo.setName(name);
         }
+
+
         CompeteVarietyScoreExample competeVarietyScoreExample=new CompeteVarietyScoreExample();
         competeVarietyScoreExample.createCriteria().andSiteOrderIdEqualTo(param.getSiteOrderId()).andJudgmentIdEqualTo(param.getJudgmentId()).andProjectIdEqualTo(param.getProjectId()).andRecStatusEqualTo((byte) 0);
+
         List<CompeteVarietyScore> competeVarietyScores = competeVarietyScoreMapper.selectByExample(competeVarietyScoreExample);
         List<CompeteVo.ScropList> scropLists=new ArrayList<>();
         competeVarietyScores.forEach(mes->{