From 2a2e5d9e0e707910d2346d2041ed8a7c2a49a81e Mon Sep 17 00:00:00 2001
From: "wenkuan.shi" <wenkuan.shi@xujiesoft.com >
Date: Wed, 26 Jun 2024 10:12:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E6=94=B9=E5=8A=A81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GetInformationForExcelServiceImpl.java    | 70 +++++++++----------
 1 file changed, 34 insertions(+), 36 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java b/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java
index 773af9ad..218f94a3 100644
--- a/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/reader/service/impl/GetInformationForExcelServiceImpl.java
@@ -617,7 +617,6 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
                     continue;
                 }
 
-
                 if (list.get(i).get(0).equals("TEST")) {
                     EquipmentDataDetail equipmentDataDetail = new EquipmentDataDetail();
                     equipmentDataDetail.setEquipmentNo(excel.getEquipmentNo());
@@ -629,47 +628,45 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
                     equipmentDataDetail.setCreateDate(new Date());
                     equipmentDataDetail.setValue0(list.get(i).get(1));
                     equipmentDataDetail.setValue1(list.get(i).get(3));
-
                     equipmentDataDetail.setNum(index);
                     equipmentDataDetails.add(equipmentDataDetail);
                     index++;
                 }
-                if (CollectionUtils.isNotEmpty(entityList)){
-                    for (EquipmentFolderDetailEntity one : entityList) {
-                        for (EquipmentDataDetail equipmentDataDetail : equipmentDataDetails) {
-                            if (StringUtils.equals(one.getCollectionSource(), "value0")){
-
-                                double value = Double.parseDouble(equipmentDataDetail.getValue0());
-                                if (StringUtils.isNotEmpty(one.getDefaultValue())) {
-                                    //规定参数
-                                    double defaultValue = Double.parseDouble(one.getDefaultValue());
-                                    if (defaultValue != value) {
-                                        equipmentDataDetail.setValue0("不合格");
-                                    }
-                                } else {
-                                    //获取表的最大值和最小值
-                                    double max = Double.parseDouble(one.getMaxValue());
-                                    double min = Double.parseDouble(one.getMinValue());
-                                    if (max <= value || value <= min) {
-                                        equipmentDataDetail.setValue0("不合格");
-                                    }
+            }
+            if (CollectionUtils.isNotEmpty(entityList)){
+                for (EquipmentFolderDetailEntity one : entityList) {
+                    for (EquipmentDataDetail equipmentDataDetail : equipmentDataDetails) {
+                        if (StringUtils.equals(one.getCollectionSource(), "value0")){
+                            double value = Double.parseDouble(equipmentDataDetail.getValue0());
+                            if (StringUtils.isNotEmpty(one.getDefaultValue())) {
+                                //规定参数
+                                double defaultValue = Double.parseDouble(one.getDefaultValue());
+                                if (defaultValue != value) {
+                                    equipmentDataDetail.setValue0("不合格");
+                                }
+                            } else {
+                                //获取表的最大值和最小值
+                                double max = Double.parseDouble(one.getMaxValue());
+                                double min = Double.parseDouble(one.getMinValue());
+                                if (max <= value || value <= min) {
+                                    equipmentDataDetail.setValue0("不合格");
                                 }
                             }
-                            if (StringUtils.equals(one.getCollectionSource(), "value1")){
-                                double value = Double.parseDouble(equipmentDataDetail.getValue1());
-                                if (StringUtils.isNotEmpty(one.getDefaultValue())) {
-                                    //规定参数
-                                    double defaultValue = Double.parseDouble(one.getDefaultValue());
-                                    if (defaultValue != value) {
-                                        equipmentDataDetail.setValue1("不合格");
-                                    }
-                                } else {
-                                    //获取表的最大值和最小值
-                                    double max = Double.parseDouble(one.getMaxValue());
-                                    double min = Double.parseDouble(one.getMinValue());
-                                    if (max <= value || value <= min) {
-                                        equipmentDataDetail.setValue1("不合格");
-                                    }
+                        }
+                        if (StringUtils.equals(one.getCollectionSource(), "value1")){
+                            double value = Double.parseDouble(equipmentDataDetail.getValue1());
+                            if (StringUtils.isNotEmpty(one.getDefaultValue())) {
+                                //规定参数
+                                double defaultValue = Double.parseDouble(one.getDefaultValue());
+                                if (defaultValue != value) {
+                                    equipmentDataDetail.setValue1("不合格");
+                                }
+                            } else {
+                                //获取表的最大值和最小值
+                                double max = Double.parseDouble(one.getMaxValue());
+                                double min = Double.parseDouble(one.getMinValue());
+                                if (max <= value || value <= min) {
+                                    equipmentDataDetail.setValue1("不合格");
                                 }
                             }
                         }
@@ -877,5 +874,6 @@ public class GetInformationForExcelServiceImpl extends ServiceImpl<GetInformatio
             }
         }
     }
+
 }