From bd953391a74b86db829df43992c7cf3c5207634b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 27 六月 2025 18:07:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/TResultWorkEvaluateMapper.xml | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TResultWorkEvaluateMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TResultWorkEvaluateMapper.xml
index 6b12e4b..5e615c6 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TResultWorkEvaluateMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TResultWorkEvaluateMapper.xml
@@ -69,6 +69,9 @@
<if test="query.teamName != null and query.teamName != ''">
and tpp.team_name like concat('%',#{query.teamName},'%')
</if>
+ <if test="query.projectName != null and query.projectName != ''">
+ and tpp.project_name like concat('%',#{query.projectName},'%')
+ </if>
<if test="query.experimentCode != null and query.experimentCode != ''">
and ted.experiment_code like concat('%',#{query.experimentCode},'%')
</if>
@@ -81,7 +84,7 @@
<if test="query.status != null">
AND trwe.status = #{query.status}
</if>
- <if test="query.teamIds != null and query.teamIds > 0">
+ <if test="query.teamIds != null and query.teamIds.size() > 0">
AND trwe.team_id in
<foreach collection="query.teamIds" item="id" open="(" separator="," close=")">
#{id}
@@ -117,7 +120,7 @@
<if test="query.status != null">
AND trwe.status = #{query.status}
</if>
- <if test="query.teamIds != null and query.teamIds > 0">
+ <if test="query.teamIds != null and query.teamIds.size() > 0">
AND trwe.team_id in
<foreach collection="query.teamIds" item="id" open="(" separator="," close=")">
#{id}
@@ -132,12 +135,12 @@
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,
ted.experiment_code AS experimentCode,ted.experiment_name AS experimentName,su.nick_name AS laboratoryChemistName,
- tedp.dispatch_id AS dispatchId
+ tedp.dispatch_id AS dispatchId,trwe.result_evaluate_json AS resultEvaluateJson
from t_experiment_dispatch_participants tedp
left join t_experiment_dispatch ted on ted.id = tedp.dispatch_id
- left join t_result_work_evaluate trwe on tedp.id = trwe.dispatch_id and trwe.evaluate_type = 2
+ left join t_result_work_evaluate trwe on ted.id = trwe.dispatch_id and trwe.evaluate_type = 2
left join t_project_proposal tpp on ted.proposal_id = tpp.id
- left join sys_user su on tedp.user_id = su.id
+ left join sys_user su on tedp.user_id = su.user_id
<where>
<if test="query.experimentCode != null and query.experimentCode != ''">
and ted.experiment_code like concat('%',#{query.experimentCode},'%')
@@ -165,12 +168,12 @@
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,
ted.experiment_code AS experimentCode,ted.experiment_name AS experimentName,su.nick_name AS laboratoryTesterName,
- tedp.dispatch_id AS dispatchId
+ tedp.dispatch_id AS dispatchId,trwe.result_evaluate_json AS resultEvaluateJson
from t_experiment_dispatch_participants tedp
left join t_experiment_dispatch ted on ted.id = tedp.dispatch_id
- left join t_result_work_evaluate trwe on tedp.id = trwe.dispatch_id and trwe.evaluate_type = 3
+ left join t_result_work_evaluate trwe on ted.id = trwe.dispatch_id and trwe.evaluate_type = 3
left join t_project_proposal tpp on ted.proposal_id = tpp.id
- left join sys_user su on tedp.user_id = su.id
+ left join sys_user su on tedp.user_id = su.user_id
<where>
<if test="query.experimentCode != null and query.experimentCode != ''">
and ted.experiment_code like concat('%',#{query.experimentCode},'%')
--
Gitblit v1.7.1