From 0220811fbcffd4bd4df334502a2af272ae29f1e3 Mon Sep 17 00:00:00 2001
From: wenminjie <1036699586@qq.com>
Date: 星期一, 13 七月 2026 10:14:30 +0800
Subject: [PATCH] 修复了已知BUG
---
ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetOriginalMapper.xml | 77 ++++++++++++++++++++++++++++++++++++++
1 files changed, 76 insertions(+), 1 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..2623e24 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetOriginalMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TTestMethodConfirmSheetOriginalMapper.xml
@@ -13,6 +13,7 @@
<result column="term_step" property="termStep" />
<result column="term_result" property="termResult" />
<result column="status" property="status" />
+ <result column="commit_user_id" property="commitUserId" />
<result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" />
<result column="create_by" property="createBy" />
@@ -22,7 +23,81 @@
<!-- 通用查询结果列 -->
<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
+ id, term_id, original_code, term_standard, term_instrument, term_reagent, term_step,
+ term_result, status,commit_user_id, 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,ttmcso.commit_user_id,
+ tpp.project_name AS projectName,tpp.project_code AS projectCode,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.projectCode != null and query.projectCode != ''">
+ and tpp.project_code like concat('%',#{query.projectCode},'%')
+ </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.roleType != null and query.roleType == 4 and query.userId != null">
+ AND ttmcso.commit_user_id = #{query.userId}
+ </if>
+ <if test="query.dispatchIds != null and query.dispatchIds.size() > 0">
+ and ttmcs.dispatch_id in
+ <foreach item="item" collection="query.dispatchIds" separator="," close=")" index="index" open="(">
+ #{item}
+ </foreach>
+ </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>
+ <select id="getOriginalPageListByDispatchId"
+ 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,ttmcso.commit_user_id,
+ tpp.project_name AS projectName,tpp.project_code AS projectCode,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.createBy != null and query.createBy != ''">
+ and ttmcso.create_by like concat('%', #{query.createBy}, '%')
+ </if>
+ <if test="query.termIds != null and query.termIds.size() > 0">
+ and ttmcso.term_id in
+ <foreach item="item" collection="query.termIds" separator="," close=")" index="index" open="(">
+ #{item}
+ </foreach>
+ </if>
+ and ttmcso.status = 2
+ AND ttmcso.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ </where>
+ ORDER BY ttmcso.create_time DESC
+ </select>
</mapper>
--
Gitblit v1.7.1