From 6eb7734d6be0a7deebbebdb14e85e4d82145893e Mon Sep 17 00:00:00 2001
From: dengchun <mike.deng@vcontractor.co.za>
Date: Sun, 6 Jul 2025 19:36:11 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E5=AE=8C=E6=88=90=E8=AF=95=E9=AA=8C?=
 =?UTF-8?q?=E6=97=B6=20=E9=9C=80=E8=A6=81=E6=A0=A1=E9=AA=8C=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=A1=AB=E5=86=99=E4=BA=86=E6=9D=A1=E7=9B=AE=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=95=B0=E9=87=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/physical-boot.sql                                          | 2 +-
 .../modules/database/controller/ExperimentController.java     | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/db/physical-boot.sql b/db/physical-boot.sql
index 444fe00..850a3b1 100644
--- a/db/physical-boot.sql
+++ b/db/physical-boot.sql
@@ -7,7 +7,7 @@ CREATE TABLE `stage_data` (
   `update_time` datetime DEFAULT NULL COMMENT '更新日期',
   `biz_id` varchar(36) CHARACTER SET utf8mb4  NOT NULL COMMENT '业务ID，存外部ID',
   `data_type` varchar(32) CHARACTER SET utf8mb4  DEFAULT NULL COMMENT '数据类型',
-  `content` varchar(200) CHARACTER SET utf8mb4  DEFAULT NULL COMMENT '搜索内容',
+  `content` longtext CHARACTER SET utf8mb4  DEFAULT NULL COMMENT '搜索内容',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
index eeb6860..b3adb1d 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
@@ -380,6 +380,10 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
         if (StringUtils.equals(dbData.getStatus(), ExperimentStatus.COMPLETED)) {
             return Result.error("试验状态:[" + dbData.getStatus() + "]不能进行修改！");
         }
+        // 如果没有填写条目统计则不能完成试验, 20250706 邓春
+        if(dbData.getTotalCountXhy() == null || dbData.getTotalCountLhs() == null) {
+            return Result.error("请填写条目统计！");
+        }
         experimentService.changeStatus(experiment.getId(), ExperimentStatus.COMPLETED);
         LocalDatabase localData = new LocalDatabase();
         localData.setClientName(dbData.getClientName());