From f192a6671390a15abb9c4d5561de9f17ef96a34f Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期六, 31 八月 2024 21:12:13 +0800
Subject: [PATCH] 平台在线率调整

---
 ycl-server/src/main/java/com/ycl/task/ContractTask.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/task/ContractTask.java b/ycl-server/src/main/java/com/ycl/task/ContractTask.java
index aa9b899..44d37f2 100644
--- a/ycl-server/src/main/java/com/ycl/task/ContractTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/ContractTask.java
@@ -67,7 +67,7 @@
     private static final Integer Offline = -1;
     private static final String AuditStatus_Pass = "1";
     private static final String Remark = "绯荤粺鐢熸垚";
-    private static final Integer randomSize = 50;
+    private static final Integer randomSize = 1;
 
     /**
      * 鍚堝悓鑰冩牳 鍦ㄧ嚎鐜囨瘡鏃ヤ换鍔℃娴�
@@ -445,8 +445,8 @@
                                 for (CalculateRuleVO calculateRuleVO : ruleList) {
                                     Double max = calculateRuleVO.getMax();
                                     Double min = calculateRuleVO.getMin();
-                                    //鍒ゆ柇鑼冨洿鍦ㄥ摢涓尯闂�
-                                    if (checkRange(min, max, BigDecimal.valueOf(result.getMissDuration()))) {
+                                    //鍒ゆ柇鑼冨洿鍦ㄥ摢涓尯闂� 鍗曚綅鏄皬鏃惰浆鎹负鍒嗛挓
+                                    if (checkRange(min, max, BigDecimal.valueOf(result.getMissDuration()*60))) {
                                         if (calculateRuleVO.getNum() == null) {
                                             calculateRuleVO.setNum(1);
                                         } else {
@@ -458,7 +458,7 @@
                         }
                     }
                     for (CalculateRuleVO calculateRuleVO : ruleList) {
-                        if (calculateRuleVO.getNum() > 0) {
+                        if (calculateRuleVO.getNum()!=null && calculateRuleVO.getNum() > 0) {
                             //闇�瑕佹墸闄ょ殑鍒嗘暟锛屾瑙勫垯鍙湁涓�鏉′笉闇�瑕佸垽鏂寖鍥�
                             double deductScore = calculateRuleVO.getCalcFraction() * calculateRuleVO.getNum();
                             ContractScore contractScore = getContractScore(calculateRuleVO, deductScore, calculateRuleVO.getNum() + "", Remark + calculateRuleVO.getNum() + "璺澶囪繚鍙嶈鍒�");

--
Gitblit v1.8.0