From 3dc714284a95fe9677a964ec039b2b547547e30d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 05 十一月 2024 11:20:37 +0800
Subject: [PATCH] 工单异步获取图片、工单导出时间参数bug
---
ycl-server/src/main/java/com/ycl/platform/service/impl/YwThresholdServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
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 2aafe2f..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
@@ -261,9 +261,11 @@
//妫�鏌ョ櫧澶╂湭璇嗗埆閲�
Integer dayNoNumberCountResult = result.getSnapPlate().getDayNoNumberCount();
check(YwThreadConstants.Car_DayNoNumberCount, dayNoNumberCountResult, result.getExternalIndexCode(), thresholdMap, workOrder, CompareType.MORE_THAN_EQ, ErrorType.UNRECOGNIZED_DAY_VOLUME.getValue());
- //杞﹁締涓昏灞炴�т笉瀹屾暣鐜�
+ //杞﹁締涓昏灞炴�т竴鑷寸巼
Integer noIntegrityCountResult = result.getIntegrity().getMainNoIntegrityCount();
- check(YwThreadConstants.Car_NoIntegrityCount, noIntegrityCountResult, result.getExternalIndexCode(), thresholdMap, workOrder, CompareType.MORE_THAN_EQ, ErrorType.CAR_SIX.getValue());
+ Integer dataCount = result.getDataCount();
+ Double integrityRate = ((double)dataCount-noIntegrityCountResult)/dataCount;
+ check(YwThreadConstants.Car_NoIntegrityCount, integrityRate, result.getExternalIndexCode(), thresholdMap, workOrder, CompareType.LESS_THAN_EQ, ErrorType.CAR_SIX.getValue());
// 鐐逛綅鍦ㄧ嚎鐜�
if (2 == result.getSnapResult()) {
workOrder.setSerialNumber(result.getExternalIndexCode());
@@ -322,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