From cc6414c80273aa32b206350fb72a6ba19be102cf Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 06 一月 2026 17:36:36 +0800
Subject: [PATCH] bug修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentSchemeController.java | 1 -
ruoyi-system/src/main/java/com/ruoyi/system/model/TExperimentScheme.java | 12 ++++++++++++
ruoyi-system/src/main/resources/mapper/system/TExperimentSchemeMapper.xml | 17 +++++++++++++----
3 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentSchemeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentSchemeController.java
index d381c0c..0912568 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentSchemeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TExperimentSchemeController.java
@@ -243,7 +243,6 @@
@PostMapping(value = "/api/t-experiment-scheme/updateTester")
public R<Boolean> updateTester(@RequestBody String param) {
TExperimentSchemeDTO dto = JSON.parseObject(param,TExperimentSchemeDTO.class);
- dto.setStatus(6);
experimentSchemeService.updateById(dto);
// 通过当前用户查询项目组
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TExperimentScheme.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TExperimentScheme.java
index c2036fe..cdd83df 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TExperimentScheme.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TExperimentScheme.java
@@ -61,6 +61,18 @@
@TableField("experiment_step_record")
private String experimentStepRecord;
+ @ApiModelProperty(value = "实验材料 草稿")
+ @TableField("new_experiment_material")
+ private String newExperimentMaterial;
+
+ @ApiModelProperty(value = "实验设备 草稿")
+ @TableField("new_experiment_device")
+ private String newExperimentDevice;
+
+ @ApiModelProperty(value = "实验步骤记录 草稿")
+ @TableField("new_experiment_step_record")
+ private String newExperimentStepRecord;
+
@ApiModelProperty(value = "中止原因")
@TableField("stop_reason")
private String stopReason;
diff --git a/ruoyi-system/src/main/resources/mapper/system/TExperimentSchemeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TExperimentSchemeMapper.xml
index 974bd14..46085cc 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TExperimentSchemeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TExperimentSchemeMapper.xml
@@ -25,19 +25,23 @@
<result column="create_by" property="createBy" />
<result column="update_by" property="updateBy" />
<result column="disabled" property="disabled" />
+ <result column="new_experiment_material" property="newExperimentMaterial" />
+ <result column="new_experiment_device" property="newExperimentDevice" />
+ <result column="new_experiment_step_record" property="newExperimentStepRecord" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, dispatch_id, experiment_date, experiment_objective, experiment_param_route, experiment_material, experiment_device,
experiment_step_record, stop_reason, stop_file,stop_file_name, commit_sign, status, audit_person_id, audit_time, audit_remark,
- create_time, update_time, create_by, update_by, disabled
+ create_time, update_time, create_by, update_by, disabled,new_experiment_material,new_experiment_device,new_experiment_step_record
</sql>
<select id="pageList" resultType="com.ruoyi.system.vo.TExperimentSchemeVO">
select tes.id, tes.dispatch_id, tes.experiment_date, tes.experiment_objective, tes.experiment_param_route,
tes.experiment_material, tes.experiment_device, tes.experiment_step_record, tes.stop_reason, tes.stop_file,tes.stop_file_name,
tes.commit_sign, tes.status, tes.audit_person_id, tes.audit_time, tes.audit_remark, tes.create_time, tes.update_time,
- tes.create_by, tes.update_by, tes.disabled, tpp.project_name as projectName,ted.experiment_code as experimentCode,
+ tes.create_by, tes.update_by, tes.disabled,tes.new_experiment_material,tes.new_experiment_device,tes.new_experiment_step_record,
+ tpp.project_name as projectName,ted.experiment_code as experimentCode,
ted.experiment_name as experimentName
from t_experiment_scheme tes
left join t_experiment_dispatch ted on tes.dispatch_id = ted.id
@@ -70,6 +74,9 @@
<if test="query.status == null">
and tes.status != -1
</if>
+ <if test="query.status == null and query.roleType == 5">
+ and tes.status != -2
+ </if>
AND tes.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
ORDER BY tes.create_time DESC
@@ -78,7 +85,8 @@
select tes.id, tes.dispatch_id, tes.experiment_date, tes.experiment_objective, tes.experiment_param_route,
tes.experiment_material, tes.experiment_device, tes.experiment_step_record, tes.stop_reason, tes.stop_file,tes.stop_file_name,
tes.commit_sign, tes.status, tes.audit_person_id, tes.audit_time, tes.audit_remark, tes.create_time, tes.update_time,
- tes.create_by, tes.update_by, tes.disabled, tpp.project_name as projectName,ted.experiment_code as experimentCode,
+ tes.create_by, tes.update_by, tes.disabled,tes.new_experiment_material,tes.new_experiment_device,tes.new_experiment_step_record,
+ tpp.project_name as projectName,ted.experiment_code as experimentCode,
ted.experiment_name as experimentName
from t_experiment_scheme tes
left join t_experiment_dispatch ted on tes.dispatch_id = ted.id
@@ -111,7 +119,8 @@
select tes.id, tes.dispatch_id, tes.experiment_date, tes.experiment_objective, tes.experiment_param_route,
tes.experiment_material, tes.experiment_device, tes.experiment_step_record, tes.stop_reason, tes.stop_file,tes.stop_file_name,
tes.commit_sign, tes.status, tes.audit_person_id, tes.audit_time, tes.audit_remark, tes.create_time, tes.update_time,
- tes.create_by, tes.update_by, tes.disabled, tpp.project_name as projectName,ted.experiment_code as experimentCode,
+ tes.create_by, tes.update_by, tes.disabled,tes.new_experiment_material,tes.new_experiment_device,tes.new_experiment_step_record,
+ tpp.project_name as projectName,ted.experiment_code as experimentCode,
ted.experiment_name as experimentName
from t_experiment_scheme tes
left join t_experiment_dispatch ted on tes.dispatch_id = ted.id
--
Gitblit v1.7.1