From f90b70b4448c8930c752111504b857b5fb76e8e3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 25 六月 2025 11:08:41 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetOriginalMapper.xml | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetOriginalMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetOriginalMapper.xml
index 7f26395..745802d 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetOriginalMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetOriginalMapper.xml
@@ -24,5 +24,38 @@
<sql id="Base_Column_List">
id, term_id, original_code, term_standard, term_instrument, term_reagent, term_step, term_result, status, create_time, update_time, create_by, update_by, disabled
</sql>
+ <select id="pageList" resultType="com.ruoyi.system.vo.TTestMethodConfirmSheetOriginalVO">
+ select ttmcso.id, ttmcso.term_id, ttmcso.original_code, ttmcso.term_standard, ttmcso.term_instrument, ttmcso.term_reagent,
+ ttmcso.term_step, ttmcso.term_result, ttmcso.status, ttmcso.create_time, ttmcso.update_time, ttmcso.create_by,
+ ttmcso.update_by, ttmcso.disabled,tpp.project_name AS projectName,ted.experiment_code AS experimentCode,
+ ted.experiment_name AS experimentName,ttmcst.term_name AS termName,ttmcst.term_code AS termCode
+ from t_test_method_confirm_sheet_original ttmcso
+ left join t_test_method_confirm_sheet_term ttmcst on ttmcso.term_id = ttmcst.id
+ left join t_test_method_confirm_sheet ttmcs on ttmcst.test_id = ttmcs.id
+ left join t_experiment_dispatch ted on ttmcs.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.createBy != null and query.createBy != ''">
+ and ttmcso.create_by like concat('%', #{query.createBy}, '%')
+ </if>
+ <if test="query.status != null">
+ and ttmcso.status = #{query.status}
+ </if>
+ <if test="query.status == null">
+ and ttmcso.status != -1
+ </if>
+ <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
+ AND ttmcso.create_time BETWEEN #{query.startTime} AND #{query.endTime}
+ </if>
+ AND ttmcso.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ </where>
+ ORDER BY ttmcso.create_time DESC
+ </select>
</mapper>
--
Gitblit v1.7.1