diff --git a/README.md b/README.md index 45d598c..8755f38 100644 --- a/README.md +++ b/README.md @@ -34,4 +34,12 @@ INSERT INTO `document_library` (`id`, `create_by`, `create_time`, `update_by`, ` INSERT INTO `document_library` (`id`, `create_by`, `create_time`, `update_by`, `update_time`, `sys_org_code`, `title`, `tags`, `content`, `parent_id`, `type`, `file_list`) VALUES ('3333333333333333333', 'admin', '2025-02-22 23:24:43', NULL, NULL, 'A01', '辐射效应损伤', NULL, NULL, NULL, 'FOLDER', NULL); +``` + +#20250324 +```sql +ALTER TABLE `physical-boot`.`experiment_test_process` +CHANGE `test_metering_point` `test_metering_point` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '测试计量点', +CHANGE `test_fluence_point` `test_fluence_point` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '测试注量点', +CHANGE `annealing_duration` `annealing_duration` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '退火时长'; ``` \ No newline at end of file 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 11b431a..941c64d 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 @@ -135,6 +135,9 @@ public class Experiment implements Serializable { @Excel(name = "状态", width = 15) @Schema(description = "状态") private String status; + + @TableField(exist = false) + private List statusList; /** * 样品信息 */ diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentMapper.xml b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentMapper.xml index cbe6ae8..0867f98 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentMapper.xml +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentMapper.xml @@ -42,6 +42,18 @@ and e.status like concat('%', #{experiment.status}, '%') + + + and e.status like concat('%', #{experiment.status}, '%') + + + and e.status in + + #{item} + + + + order by ${loginUser.postText} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java index 25ff2a7..c796bb5 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java @@ -273,6 +273,10 @@ public class ExperimentServiceImpl extends ServiceImpl join(Page page, Experiment experiment, SysUser loginUser) { + if (StringUtils.contains(experiment.getStatus(), ",")) { + experiment.setStatusList(List.of(experiment.getStatus().split(","))); + experiment.setStatus(null); + } return baseMapper.join(page, experiment, loginUser); }