From b91945ea32378a71d1e57356af6e16703a1ceaa7 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 01 十一月 2024 14:52:16 +0800
Subject: [PATCH] 工单只下发考核的、阈值bug

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java |    8 ++++++++
 ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java   |    4 ++++
 2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index ae1a348..5859cbc 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -40,6 +40,8 @@
 import com.ycl.utils.http.HttpUtils;
 import com.ycl.utils.redis.RedisCache;
 import com.ycl.utils.uuid.IdUtils;
+import constant.ApiConstants;
+import constant.CheckConstants;
 import constant.Constants;
 import constant.RedisConstant;
 import enumeration.general.*;
@@ -211,9 +213,11 @@
             return Boolean.TRUE;
         }
         List<String> willAddSerialNumber = waitAddList.stream().map(WorkOrder::getSerialNumber).collect(Collectors.toList());
+        //鍙敓鎴愯�冩牳璁惧鐨勫伐鍗�
         List<YwPoint> pointList = new LambdaQueryChainWrapper<>(ywPointService.getBaseMapper())
                 .select(YwPoint::getUnitId, YwPoint::getSerialNumber, YwPoint::getImportantTag, YwPoint::getImportantTag, YwPoint::getProvinceTag, YwPoint::getImportantCommandImageTag)
                 .in(YwPoint::getSerialNumber, willAddSerialNumber)
+                .eq(YwPoint::getExamineStatus, Boolean.TRUE)
                 .list();
         Map<String, YwPoint> pointMapping = pointList.stream().collect(Collectors.toMap(YwPoint::getSerialNumber, point -> point));
         // 鏌ュ嚭閲嶇偣鐐逛綅銆佹櫘閫氱偣浣嶇殑澶勭悊鏃堕棿
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java
index fcf67f5..8728731 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java
@@ -324,6 +324,14 @@
                     T thresholdAutoValue = parseThreshold(ywThreshold.getValueAuto(), value.getClass());
                     //鐩存帴涓嬪彂宸ュ崟闃堝��
                     T thresholdValue = parseThreshold(ywThreshold.getValue(), value.getClass());
+                    if("percent".equals(ywThreshold.getCountType())){
+                        if (thresholdAutoValue instanceof Float) {
+                            thresholdAutoValue = (T) Float.valueOf(((Float) thresholdAutoValue) / 100f);
+                        }
+                        if (thresholdValue instanceof Float) {
+                            thresholdValue = (T) Float.valueOf(((Float) thresholdValue) / 100f);
+                        }
+                    }
                     //姣旇緝澶у皬锛屽姞鍏ュ埌瀵瑰簲寰呭鐞嗛泦鍚�
                     if (compareType.compare(v, thresholdValue)) {
                         //杩涘叆宸ュ崟鐩存帴涓嬪彂

--
Gitblit v1.8.0