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

---
 .../com/ccsens/mt/service/CompeteService.java | 51 ++++++++++---------
 1 file changed, 28 insertions(+), 23 deletions(-)

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 b4222b6d..26eeb341 100644
--- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java
+++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java
@@ -1038,26 +1038,31 @@ public class CompeteService implements ICompeteService {
         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));
-                    }
+//            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));
                 }
             }
         }else {
@@ -1067,9 +1072,9 @@ public class CompeteService implements ICompeteService {
                 CompeteVarietyScoreExample competeVarietyScoreExample=new CompeteVarietyScoreExample();
                 competeVarietyScoreExample.createCriteria().andRecStatusEqualTo((byte)0).andSiteOrderIdEqualTo(param.getSiteOrderId());
                 List<CompeteVarietyScore> competeVarietyScoresList = competeVarietyScoreMapper.selectByExample(competeVarietyScoreExample);
-                for (CompeteVarietyScore competeVarietyScore : competeVarietyScoresList) {
-                    competeVarietyScore.setScore(new BigDecimal(0));
-                    competeVarietyScoreMapper.updateByPrimaryKeySelective(competeVarietyScore);
+                for (int i = 0; i < competeVarietyScoresList.size(); i++) {
+                    competeVarietyScoresList.get(i).setScore(new BigDecimal(0));
+                    competeVarietyScoreMapper.updateByPrimaryKeySelective(competeVarietyScoresList.get(i));
                 }
             }
         }