From b7ddbd0be453c883defa6d77c4f71b1de51112af Mon Sep 17 00:00:00 2001
From: "Lihong@123456" <1090591095@qq.com>
Date: Thu, 26 Nov 2020 19:54:54 +0800
Subject: [PATCH] 11-26-7

---
 .../com/ccsens/mt/service/CompeteService.java | 32 ++++++++++---------
 1 file changed, 17 insertions(+), 15 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 84288b3a..3995ea61 100644
--- a/mt/src/main/java/com/ccsens/mt/service/CompeteService.java
+++ b/mt/src/main/java/com/ccsens/mt/service/CompeteService.java
@@ -1618,10 +1618,10 @@ public class CompeteService implements ICompeteService {
                 }
                 //3分钟单摇跳得分
                 CompeteStartOrderExample competeStartOrderExample1 = new CompeteStartOrderExample();
-                competeStartOrderExample.createCriteria().andProjectIdEqualTo(Constant.SINGLE_ROLL_3_M).andPlayerIdEqualTo(mes.getPlayerId()).andRecStatusEqualTo(type);
-                List<CompeteStartOrder> competeStartOrders1 = competeStartOrderMapper.selectByExample(competeStartOrderExample);
+                competeStartOrderExample1.createCriteria().andProjectIdEqualTo(Constant.SINGLE_ROLL_3_M).andPlayerIdEqualTo(mes.getPlayerId()).andRecStatusEqualTo(type);
+                List<CompeteStartOrder> competeStartOrders1 = competeStartOrderMapper.selectByExample(competeStartOrderExample1);
                 if (competeStartOrders1.size() > 0) {
-                    CompeteStartOrder competeStartOrder1 = competeStartOrders.get(0);
+                    CompeteStartOrder competeStartOrder1 = competeStartOrders1.get(0);
                     long id1 = competeStartOrder1.getId();
                     CompeteCountScoreExample competeCountScoreExample1 = new CompeteCountScoreExample();
                     competeCountScoreExample1.createCriteria().andSiteOrderIdEqualTo(id1).andRecStatusEqualTo(type);
@@ -1639,6 +1639,7 @@ public class CompeteService implements ICompeteService {
                 BigDecimal bigDecimal4 = new BigDecimal(120);
                 BigDecimal bigDecimal5 = new BigDecimal(130);
                 BigDecimal bigDecimal6 = new BigDecimal(140);
+
                 BigDecimal bigDecimal7 = new BigDecimal(300);
                 BigDecimal bigDecimal8 = new BigDecimal(380);
                 BigDecimal bigDecimal9 = new BigDecimal(460);
@@ -1648,45 +1649,46 @@ public class CompeteService implements ICompeteService {
                 BigDecimal s =mes.getSecondTime();
                 if (mes.getSecondTime()!= null && mes.getMinuteTime()!= null) {
                     //判断30s单摇跳等级
-                    if (mes.getSecondTime().compareTo(bigDecimal0) < 1) {
+                    if (s.compareTo(bigDecimal0) >-1 && s.compareTo(bigDecimal2) <1) {
                         mes.setSecondGrade(1);
                     }
-                    if (mes.getSecondTime().compareTo(bigDecimal2) < 1) {
+                    if (s.compareTo(bigDecimal2) >-1 && s.compareTo(bigDecimal3) <1) {
                         mes.setSecondGrade(2);
                     }
-                    if (mes.getSecondTime().compareTo(bigDecimal3) < 1) {
+                    if (s.compareTo(bigDecimal3) >-1 && s.compareTo(bigDecimal4) <1) {
                         mes.setSecondGrade(3);
                     }
-                    if (mes.getSecondTime().compareTo(bigDecimal4) < 1) {
+                    if (s.compareTo(bigDecimal4) >-1 && s.compareTo(bigDecimal5) <1) {
                         mes.setSecondGrade(4);
                     }
-                    if (mes.getSecondTime().compareTo(bigDecimal5) < 1) {
+                    if (s.compareTo(bigDecimal5) >-1 && s.compareTo(bigDecimal6) <1) {
                         mes.setSecondGrade(5);
                     }
-                    if (mes.getSecondTime().compareTo(bigDecimal6) < 1) {
+                    if (s.compareTo(bigDecimal6)>-1) {
                         mes.setSecondGrade(6);
                     }
                     //判断3分钟单摇跳等级
-                    if (mes.getMinuteTime().compareTo(bigDecimal7) < 1) {
+                    BigDecimal m =mes.getMinuteTime();
+                    if (m.compareTo(bigDecimal7) >-1 && m.compareTo(bigDecimal8)<1) {
                         mes.setMinuteGrade(1);
                     }
-                    if (mes.getMinuteTime().compareTo(bigDecimal8) < 1) {
+                    if (m.compareTo(bigDecimal8) >-1&& m.compareTo(bigDecimal9) <1) {
                         mes.setMinuteGrade(2);
                     }
 
-                    if (mes.getMinuteTime().compareTo(bigDecimal9) < 1) {
+                    if (m.compareTo(bigDecimal9) >-1&& m.compareTo(bigDecimal10) <1) {
                         mes.setMinuteGrade(3);
                     }
 
-                    if (mes.getMinuteTime().compareTo(bigDecimal10) < 1) {
+                    if (m.compareTo(bigDecimal10)>-1 && m.compareTo(bigDecimal11)<1) {
                         mes.setMinuteGrade(4);
                     }
 
-                    if (mes.getMinuteTime().compareTo(bigDecimal11) < 1) {
+                    if (m.compareTo(bigDecimal11)>-1 && m.compareTo(bigDecimal12)<1) {
                         mes.setMinuteGrade(5);
                     }
 
-                    if (mes.getMinuteTime().compareTo(bigDecimal12) < 1) {
+                    if (m.compareTo(bigDecimal12)>-1) {
                         mes.setMinuteGrade(6);
                     }
                     //如果30s得等级小于等于3分钟得等级