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

update

Browse Source
This commit is contained in:
ls
2025-03-28 22:17:26 +08:00
parent b3e0d059d5
commit 725311ef88
4 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@@ -35,3 +35,11 @@ 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 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); ('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 '退火时长';
```

3
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/Experiment.java
View File

@@ -135,6 +135,9 @@ public class Experiment implements Serializable {
@Excel(name = "状态", width = 15) @Excel(name = "状态", width = 15)
@Schema(description = "状态") @Schema(description = "状态")
private String status; private String status;
@TableField(exist = false)
private List<String> statusList;
/** /**
* 样品信息 * 样品信息
*/ */

12
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/mapper/xml/ExperimentMapper.xml
View File

@@ -42,6 +42,18 @@
<if test="experiment.status != null and experiment.status != ''"> <if test="experiment.status != null and experiment.status != ''">
and e.status like concat('%', #{experiment.status}, '%') and e.status like concat('%', #{experiment.status}, '%')
</if> </if>
<if test="experiment.status != null and experiment.status != ''">
and e.status like concat('%', #{experiment.status}, '%')
</if>
<if test="experiment.statusList != null and experiment.statusList != ''">
and e.status in
<foreach item="item" collection="experiment.statusList" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</if>
</where> </where>
<if test="loginUser.postText != null and loginUser.postText != ''"> <if test="loginUser.postText != null and loginUser.postText != ''">
order by ${loginUser.postText} order by ${loginUser.postText}

4
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java
View File

@@ -273,6 +273,10 @@ public class ExperimentServiceImpl extends ServiceImpl<ExperimentMapper, Experim
@Override @Override
public IPage<Experiment> join(Page<Experiment> page, Experiment experiment, SysUser loginUser) { public IPage<Experiment> join(Page<Experiment> 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); return baseMapper.join(page, experiment, loginUser);
} }