From b6657187eec92ccd148fc3f4d1db97ec8849e240 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 20 六月 2025 21:24:26 +0800
Subject: [PATCH] 菌种库所有代码
---
ruoyi-system/src/main/resources/mapper/system/TStrainReportMapper.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TStrainReportMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TStrainReportMapper.xml
index 7467c50..781018e 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TStrainReportMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TStrainReportMapper.xml
@@ -38,10 +38,10 @@
</sql>
<select id="pageList" resultType="com.ruoyi.system.vo.TStrainReportVO">
select t1.*,t2.team_name as teamName,t3.nick_name as experimentName,t4.nick_name as evaluateName from t_strain_report t1
- left join t_strain_report_detail t5 on t5.report_id = t1.id and t5.evaluate_human_type =1
+ left join t_strain_report_detail t5 on t5.report_id = t1.id
left join t_project_team t2 on t1.project_id = t2.id
left join sys_user t3 on t3.user_id = t5.experiment_id
- left join sys_user t4 on t4.user_id = t1.evaluate_id
+ left join sys_user t4 on t4.user_id = t5.evaluate_id
<where>
<if test="query.teamName != null and query.teamName != ''">
and t2.team_name like concat('%',#{query.teamName},'%')
@@ -54,6 +54,12 @@
</if>
<if test="query.userId != null and query.userId != ''">
and t5.experiment_id = #{query.userId}
+ </if>
+ <if test="query.evaluateHumanType == 3">
+ and t5.evaluate_human_type = 2
+ </if>
+ <if test="query.evaluateHumanType == 4">
+ and t5.evaluate_human_type = 1
</if>
<if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
and t1.evaluate_time between #{query.startTime} and #{query.endTime}
@@ -119,7 +125,7 @@
</if>
AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
- order by t1.status asc, t1.evaluate_time desc
+ order by t1.create_time desc
</select>
</mapper>
--
Gitblit v1.7.1