physical3/physical-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. 完成试验时 需要校验是否填写了条目统计数量。

Browse Source
This commit is contained in:
dengchun
2025-07-06 19:36:11 +08:00
parent e466d8ae3f
commit 6eb7734d6b
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
db/physical-boot.sql
View File

@@ -7,7 +7,7 @@ CREATE TABLE `stage_data` (
`update_time` datetime DEFAULT NULL COMMENT '更新日期', `update_time` datetime DEFAULT NULL COMMENT '更新日期',
`biz_id` varchar(36) CHARACTER SET utf8mb4 NOT NULL COMMENT '业务ID，存外部ID', `biz_id` varchar(36) CHARACTER SET utf8mb4 NOT NULL COMMENT '业务ID，存外部ID',
`data_type` varchar(32) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '数据类型', `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`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

4
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
View File

@@ -380,6 +380,10 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
if (StringUtils.equals(dbData.getStatus(), ExperimentStatus.COMPLETED)) { if (StringUtils.equals(dbData.getStatus(), ExperimentStatus.COMPLETED)) {
return Result.error("试验状态:[" + dbData.getStatus() + "]不能进行修改！"); return Result.error("试验状态:[" + dbData.getStatus() + "]不能进行修改！");
} }
// 如果没有填写条目统计则不能完成试验, 20250706 邓春
if(dbData.getTotalCountXhy() == null || dbData.getTotalCountLhs() == null) {
return Result.error("请填写条目统计！");
}
experimentService.changeStatus(experiment.getId(), ExperimentStatus.COMPLETED); experimentService.changeStatus(experiment.getId(), ExperimentStatus.COMPLETED);
LocalDatabase localData = new LocalDatabase(); LocalDatabase localData = new LocalDatabase();
localData.setClientName(dbData.getClientName()); localData.setClientName(dbData.getClientName());