From a0e9fac251df54e5ed6159ce1fdb77d463ebdc48 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 26 六月 2025 20:05:35 +0800
Subject: [PATCH] 菌种库所有代码
---
ruoyi-system/src/main/resources/mapper/system/TStrainReportMapper.xml | 16 +++++++++++++---
1 files changed, 13 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 781018e..4e25013 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TStrainReportMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TStrainReportMapper.xml
@@ -37,7 +37,10 @@
id, project_id, report_code, report_name, report_content, create_time, update_time, create_by, update_by, disabled, enclosure_name, enclosure_size, enclosure_url, status, experiment_id, evaluate, evaluate_total, audit_remark, audit_time, audit_id, evaluate_time, evaluate_id, is_draft, report_type, evaluate_human_type, evaluate_type
</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
+ select t1.*,t2.team_name as teamName,t3.nick_name as experimentName,t4.nick_name as evaluateName,
+ t5.create_time as evaluateTime
+
+ from t_strain_report t1
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
@@ -66,7 +69,7 @@
</if>
<if test="query.evaluateId != null and query.evaluateId.size()>0">
- AND t1.evaluate_id IN
+ AND t5.evaluate_id IN
<foreach collection="query.evaluateId" close=")" open="(" item="id" separator=",">
#{id}
</foreach>
@@ -84,8 +87,15 @@
and t1.team_name like concat('%',#{query.teamName},'%')
</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}
+ and t1.create_time between #{query.startTime} and #{query.endTime}
</if>
+ <if test="query.projectIds != null and query.projectIds.size() > 0">
+ and t1.id in
+ <foreach item="item" collection="query.projectIds" separator="," open="(" close=")" index="">
+ #{item}
+ </foreach>
+ </if>
+
AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
--
Gitblit v1.7.1