From 681ebad558051dd3b18c379b5c06b23bc08c0761 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期五, 14 六月 2024 18:08:10 +0800
Subject: [PATCH] 标准库导入

---
 cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
index 0bcb4ac..cf1347c 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/CapacityScopeController.java
@@ -223,6 +223,7 @@
                         db_str = structureItemParameterService.getOne(Wrappers.lambdaQuery(StructureItemParameter.class)
                                 .eq(StructureItemParameter::getInspectionItem, str.getInspectionItem())
                                 .eq(StructureItemParameter::getSample, str.getSample())
+                                .last("limit 1")
                         );
                     } catch (Exception e) {
                         throw new ErrorException("閲嶅鏌ヨ锛�" + str.getInspectionItem());
@@ -233,6 +234,7 @@
                                 .eq(StructureItemParameter::getInspectionItem, str.getInspectionItem())
                                 .eq(StructureItemParameter::getSample, str.getSample())
                                 .eq(StructureItemParameter::getInspectionItemSubclass, str.getInspectionItemSubclass())
+                                .last("limit 1")
                         );
                     } catch (Exception e) {
                         throw new ErrorException("閲嶅鏌ヨ锛�" + str.getInspectionItem() + " " + str.getInspectionItemSubclass());
@@ -282,7 +284,7 @@
                 if (list1.get(13) == null) {
                     str.setPrice(null);
                 } else {
-                    str.setPrice(BigDecimal.valueOf(Long.parseLong((list1.get(13).toString()))));
+                    str.setPrice(list1.get(13) + "");
                 }
 
                 if (list1.get(14) == null) {
@@ -334,6 +336,18 @@
                 } else {
                     str.setTemplateId(null);
                 }
+                try {
+                    if (list1.get(22) != null) {
+                        str.setInspectionItemClass(list1.get(22) + "");
+                    }
+                } catch (Exception e) {
+                }
+                try {
+                    if (list1.get(23) != null) {
+                        str.setInspectionItemClassEn(list1.get(23) + "");
+                    }
+                } catch (Exception e) {
+                }
                 lists.add(str);
             }
         });

--
Gitblit v1.9.3