From 4c96e748fb150802fe5abf14c36efc637098f239 Mon Sep 17 00:00:00 2001
From: wang0018 <1007152140@qq.com>
Date: Fri, 20 Nov 2020 14:44:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E8=8A=B1?=
 =?UTF-8?q?=E6=A0=B7=E8=B5=9B=E6=88=90=E7=BB=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mt/src/main/java/com/ccsens/mt/bean/vo/CompeteVo.java      | 2 ++
 mt/src/main/java/com/ccsens/mt/service/CompeteService.java | 4 ++++
 2 files changed, 6 insertions(+)

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 9ef0aef2..4a8aba8c 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
@@ -519,6 +519,8 @@ public class CompeteVo {
         private Byte site;
         @ApiModelProperty("备注")
         private String remark;
+        @ApiModelProperty("是否弃权")
+        private Byte waiver;
         @ApiModelProperty("分数合集")
         private List<ScropList> scoreList;
     }
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 64a5c380..282ff503 100644
--- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java
+++ b/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->{