From 0220811fbcffd4bd4df334502a2af272ae29f1e3 Mon Sep 17 00:00:00 2001
From: wenminjie <1036699586@qq.com>
Date: 星期一, 13 七月 2026 10:14:30 +0800
Subject: [PATCH] 修复了已知BUG
---
ruoyi-system/src/main/resources/mapper/system/TExperimentSchemeMapper.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TExperimentSchemeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TExperimentSchemeMapper.xml
index 46085cc..6d1da00 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TExperimentSchemeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TExperimentSchemeMapper.xml
@@ -41,7 +41,7 @@
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,tes.new_experiment_material,tes.new_experiment_device,tes.new_experiment_step_record,
- tpp.project_name as projectName,ted.experiment_code as experimentCode,
+ tpp.project_name as projectName,tpp.project_code as projectCode,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
@@ -52,6 +52,9 @@
</if>
<if test="query.projectName != null and query.projectName != ''">
and tpp.project_name like concat('%', #{query.projectName}, '%')
+ </if>
+ <if test="query.projectCode != null and query.projectCode != ''">
+ and tpp.project_code like concat('%',#{query.projectCode},'%')
</if>
<if test="query.experimentCode != null and query.experimentCode != ''">
and ted.experiment_code like concat('%', #{query.experimentCode}, '%')
@@ -86,7 +89,7 @@
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,tes.new_experiment_material,tes.new_experiment_device,tes.new_experiment_step_record,
- tpp.project_name as projectName,ted.experiment_code as experimentCode,
+ tpp.project_name as projectName,tpp.project_code as projectCode,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
@@ -97,6 +100,9 @@
</if>
<if test="query.projectName != null and query.projectName != ''">
and tpp.project_name like concat('%', #{query.projectName}, '%')
+ </if>
+ <if test="query.projectCode != null and query.projectCode != ''">
+ and tpp.project_code like concat('%',#{query.projectCode},'%')
</if>
<if test="query.experimentCode != null and query.experimentCode != ''">
and ted.experiment_code like concat('%', #{query.experimentCode}, '%')
@@ -120,7 +126,7 @@
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,tes.new_experiment_material,tes.new_experiment_device,tes.new_experiment_step_record,
- tpp.project_name as projectName,ted.experiment_code as experimentCode,
+ tpp.project_name as projectName,tpp.project_code AS projectCode,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