From 05fed078888dd5c2624751b6b29c5e16b7f1b2e6 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 19 五月 2025 09:29:28 +0800
Subject: [PATCH] 测评接口，bug修改
---
ruoyi-system/src/main/resources/mapper/system/TExperimentResultReportMapper.xml | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TExperimentResultReportMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TExperimentResultReportMapper.xml
index 3419716..0e34df5 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TExperimentResultReportMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TExperimentResultReportMapper.xml
@@ -51,6 +51,47 @@
<if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
AND terr.create_time BETWEEN #{query.startTime} AND #{query.endTime}
</if>
+ <if test="query.dispatchIds != null and query.dispatchIds.size() > 0">
+ AND terr.dispatch_id IN
+ <foreach collection="query.dispatchIds" item="item" index="index" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ AND terr.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ </where>
+ ORDER BY terr.create_time DESC
+ </select>
+ <select id="evaluatePageList" resultType="com.ruoyi.system.vo.TExperimentResultReportVO">
+ select terr.id, terr.dispatch_id, terr.experiment_result, terr.status, terr.evaluate_one, terr.evaluate_two, terr.evaluate_three,
+ terr.evaluate_four, terr.evaluate_five, terr.evaluate_six, terr.evaluate_person_id, terr.evaluate_time, terr.create_time,
+ terr.update_time, terr.create_by, terr.update_by, terr.disabled, tpp.project_name AS projectName,
+ ted.experiment_code AS experimentCode, ted.experiment_name AS experimentName
+ from t_experiment_result_report terr
+ left join t_experiment_dispatch ted on terr.dispatch_id = ted.id
+ left join t_project_proposal tpp on ted.proposal_id = tpp.id
+ <where>
+ <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>
+ <if test="query.experimentName != null and query.experimentName != ''">
+ and ted.experiment_name like concat('%', #{query.experimentName}, '%')
+ </if>
+ <if test="query.status != null">
+ and terr.status = #{query.status}
+ </if>
+ <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
+ AND terr.create_time BETWEEN #{query.startTime} AND #{query.endTime}
+ </if>
+ <if test="query.dispatchIds != null and query.dispatchIds.size() > 0">
+ AND terr.dispatch_id IN
+ <foreach collection="query.dispatchIds" item="item" index="index" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
+ AND terr.status IN (2,3,4,5)
AND terr.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
</where>
ORDER BY terr.create_time DESC
--
Gitblit v1.7.1