From 6669356ceac6135677ff9657d2b2511b5c4d9b61 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Fri, 19 Jul 2024 18:15:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aqgqj/basis/entity/vo/ConfigItemsVo.java   |  2 +-
 .../bonus/aqgqj/basis/entity/vo/CustomVo.java  | 18 ++++++++++++++++++
 .../impl/ExperimentStandardServiceImpl.java    | 10 +++++-----
 3 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/com/bonus/aqgqj/basis/entity/vo/CustomVo.java

diff --git a/src/main/java/com/bonus/aqgqj/basis/entity/vo/ConfigItemsVo.java b/src/main/java/com/bonus/aqgqj/basis/entity/vo/ConfigItemsVo.java
index b664e31..2d2368a 100644
--- a/src/main/java/com/bonus/aqgqj/basis/entity/vo/ConfigItemsVo.java
+++ b/src/main/java/com/bonus/aqgqj/basis/entity/vo/ConfigItemsVo.java
@@ -48,7 +48,7 @@ public class ConfigItemsVo {
      * 金额
      */
     @NotBlank(message = "金额不能为空", groups = {Query.class})
-    @Pattern(regexp = "[0-9]{1,8}(,[0-9]{8})*(.[0-9]{1,2})?", message = "金额格式不正确", groups = {Query.class})
+    @Pattern(regexp = "(?!0(?:\\.\\d{1,2})?$)(?:[1-9]\\d{0,7}(?:\\.\\d{1,2})?|100000000(?:\\.0{1,2})?)", message = "金额格式不正确（0-100000000）", groups = {Query.class})
     private String amount;
 
     /**
diff --git a/src/main/java/com/bonus/aqgqj/basis/entity/vo/CustomVo.java b/src/main/java/com/bonus/aqgqj/basis/entity/vo/CustomVo.java
new file mode 100644
index 0000000..f1c7c43
--- /dev/null
+++ b/src/main/java/com/bonus/aqgqj/basis/entity/vo/CustomVo.java
@@ -0,0 +1,18 @@
+package com.bonus.aqgqj.basis.entity.vo;
+
+import lombok.Data;
+
+/**
+ * @className:CustomVo
+ * @author:cwchen
+ * @date:2024-07-19-16:30
+ * @version:1.0
+ * @description:客户送样单位-vo
+ */
+@Data
+public class CustomVo {
+
+    private Long id;
+    private String customName;
+    private String customType;
+}
diff --git a/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentStandardServiceImpl.java b/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentStandardServiceImpl.java
index 3306ce4..52ccb17 100644
--- a/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentStandardServiceImpl.java
+++ b/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentStandardServiceImpl.java
@@ -323,30 +323,30 @@ public class ExperimentStandardServiceImpl implements ExperimentStandardService
         List<ExperBasisVo> basisVos = vo.getBasisVos();
         List<ConfigItemsVo> configItemsVos = vo.getConfigItemsVos();
         for (ConfigDevVo deviceVo : deviceVos) {
-            String validResult = validatorsUtils.valid(vo, ConfigDevVo.Query.class);
+            String validResult = validatorsUtils.valid(deviceVo, ConfigDevVo.Query.class);
             if (StringUtils.isNotBlank(validResult)) {
                 return validResult;
             }
         }
         for (ConfigMainDevVo mainDeviceVo : mainDeviceVos) {
-            String validResult = validatorsUtils.valid(vo, ConfigMainDevVo.Query.class);
+            String validResult = validatorsUtils.valid(mainDeviceVo, ConfigMainDevVo.Query.class);
             if (StringUtils.isNotBlank(validResult)) {
                 return validResult;
             }
         }
         for (ExperBasisVo basisVo : basisVos) {
-            String validResult = validatorsUtils.valid(vo, ExperBasisVo.Query.class);
+            String validResult = validatorsUtils.valid(basisVo, ExperBasisVo.Query.class);
             if (StringUtils.isNotBlank(validResult)) {
                 return validResult;
             }
         }
         for (ConfigItemsVo configItemsVo : configItemsVos) {
-            String validResult = validatorsUtils.valid(vo, ConfigItemsVo.Query.class);
+            String validResult = validatorsUtils.valid(configItemsVo, ConfigItemsVo.Query.class);
             if (StringUtils.isNotBlank(validResult)) {
                 return validResult;
             }
             for (ConfigItemVo configItemVo : configItemsVo.getItemList()) {
-                String validResult2 = validatorsUtils.valid(vo, ConfigItemVo.Query.class);
+                String validResult2 = validatorsUtils.valid(configItemVo, ConfigItemVo.Query.class);
                 if (StringUtils.isNotBlank(validResult2)) {
                     return validResult2;
                 }