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/TResultWorkEvaluateMapper.xml | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TResultWorkEvaluateMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TResultWorkEvaluateMapper.xml
index 9d3ebd0..7b19c97 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TResultWorkEvaluateMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TResultWorkEvaluateMapper.xml
@@ -60,7 +60,7 @@
select trwe.id, trwe.dispatch_id, trwe.user_id, trwe.result_report_id,trwe.evaluate_type, trwe.evaluate_one,
trwe.evaluate_two, trwe.evaluate_three, trwe.evaluate_four, trwe.evaluate_five, trwe.evaluate_six,
trwe.status, trwe.evaluate_person_id, trwe.evaluate_time,trwe.result_evaluate_json,trwe.team_id, trwe.create_time,
- trwe.update_time, trwe.create_by, trwe.update_by, trwe.disabled, tpp.project_name as projectName,
+ trwe.update_time, trwe.create_by, trwe.update_by, trwe.disabled, tpp.project_name as projectName,tpp.project_code AS projectCode,
ted.experiment_code as experimentCode,ted.experiment_name as experimentName
from t_result_work_evaluate trwe
left join t_experiment_dispatch ted on trwe.dispatch_id = ted.id
@@ -71,6 +71,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},'%')
@@ -102,7 +105,7 @@
select trwe.id, trwe.dispatch_id, trwe.user_id, trwe.result_report_id,trwe.evaluate_type, trwe.evaluate_one,
trwe.evaluate_two, trwe.evaluate_three, trwe.evaluate_four, trwe.evaluate_five, trwe.evaluate_six,
trwe.status, trwe.evaluate_person_id, trwe.evaluate_time,trwe.result_evaluate_json,trwe.team_id, trwe.create_time,
- trwe.update_time, trwe.create_by, trwe.update_by, trwe.disabled, tpp.project_name as projectName,
+ trwe.update_time, trwe.create_by, trwe.update_by, trwe.disabled, tpp.project_name as projectName,tpp.project_code AS projectCode,
ted.experiment_code as experimentCode,ted.experiment_name as experimentName
from t_result_work_evaluate trwe
left join t_experiment_dispatch ted on trwe.dispatch_id = ted.id
@@ -139,7 +142,7 @@
</select>
<select id="getEvaluateChemistPageList" resultType="com.ruoyi.system.vo.ResultEvaluateChemistTesterVO">
select trwe.evaluate_time,CASE WHEN trwe.id IS NOT NULL THEN 1 ELSE 0 END AS isEvaluate,trwe.id,
- tedp.id AS participantsId,tpp.project_name AS projectName,tpp.project_stage AS projectStage,
+ tedp.id AS participantsId,tpp.project_name AS projectName,tpp.project_code AS projectCode,tpp.project_stage AS projectStage,
ted.experiment_code AS experimentCode,ted.experiment_name AS experimentName,su.nick_name AS laboratoryChemistName,
tedp.dispatch_id AS dispatchId,trwe.result_evaluate_json AS resultEvaluateJson
from t_experiment_dispatch_participants tedp
@@ -156,6 +159,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.userId != null">
and tedp.user_id = #{query.userId}
@@ -175,7 +181,7 @@
</select>
<select id="getEvaluateTesterPageList" resultType="com.ruoyi.system.vo.ResultEvaluateChemistTesterVO">
select trwe.evaluate_time,CASE WHEN trwe.id IS NOT NULL THEN 1 ELSE 0 END AS isEvaluate,trwe.id,
- tedp.id AS participantsId,tpp.project_name AS projectName,tpp.project_stage AS projectStage,
+ tedp.id AS participantsId,tpp.project_name AS projectName,tpp.project_code AS projectCode,tpp.project_stage AS projectStage,
ted.experiment_code AS experimentCode,ted.experiment_name AS experimentName,su.nick_name AS laboratoryTesterName,
tedp.dispatch_id AS dispatchId,trwe.result_evaluate_json AS resultEvaluateJson
from t_experiment_dispatch_participants tedp
@@ -193,6 +199,9 @@
<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.userId != null">
and tedp.user_id = #{query.userId}
</if>
--
Gitblit v1.7.1