From 16cec65ee298e6af0ea74eb66cfc0b02baf0fd19 Mon Sep 17 00:00:00 2001 From: dengchun Date: Thu, 1 May 2025 13:07:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E9=AA=8C=E6=96=B0=E5=A2=9E=E7=90=86?= =?UTF-8?q?=E5=8C=96=E6=89=80=E7=BB=9F=E8=AE=A1=E3=80=81=E8=A5=BF=E6=A0=B8?= =?UTF-8?q?=E9=99=A2=E7=BB=9F=E8=AE=A1=E4=B8=A4=E4=B8=AA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/ScriptChanges/20250503_release.sql | 21 +++++++++++++++++++ .../modules/database/entity/Experiment.java | 14 +++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 db/ScriptChanges/20250503_release.sql diff --git a/db/ScriptChanges/20250503_release.sql b/db/ScriptChanges/20250503_release.sql new file mode 100644 index 0000000..fd7b617 --- /dev/null +++ b/db/ScriptChanges/20250503_release.sql @@ -0,0 +1,21 @@ +-- 添加搜索数据表 +-- 试验表添加 理化所统计、西核院统计两个字段 + +DROP TABLE IF EXISTS `component_search`; +CREATE TABLE `component_search` ( + `id` varchar(36) CHARACTER SET utf8mb4 NOT NULL, + `create_by` varchar(50) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '创建人', + `create_time` datetime DEFAULT NULL COMMENT '创建日期', + `update_by` varchar(50) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '更新人', + `update_time` datetime DEFAULT NULL COMMENT '更新日期', + `data_type` varchar(32) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '数据类型', + `content` varchar(200) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '搜索内容', + `extent_info` varchar(648) CHARACTER SET utf8mb4 DEFAULT NULL COMMENT '拓展字段', + -- 索引 + INDEX idx_combined (data_type, content), + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + + + + diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java index ad7c336..43719fa 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java @@ -220,4 +220,18 @@ public class Experiment implements Serializable { //@TableField(exist = false) //private List experimentTestProcessList; + + /** + * 西核院统计 + */ + @Excel(name = "西核院统计", width = 15) + @Schema(description = "西核院统计") + private Integer totalCountXhy; + /** + * 理化所统计 + */ + @Excel(name = "理化所统计", width = 15) + @Schema(description = "理化所统计") + private Integer totalCountLhs; + }