From b434c283d2a4787b6eb840a0289d6adc62fba132 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 14 五月 2024 15:07:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/resources/mapper/StandardMethodMapper.xml | 59 +++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 43 insertions(+), 16 deletions(-)
diff --git a/cnas-server/src/main/resources/mapper/StandardMethodMapper.xml b/cnas-server/src/main/resources/mapper/StandardMethodMapper.xml
index 1dfd0d1..87ac14b 100644
--- a/cnas-server/src/main/resources/mapper/StandardMethodMapper.xml
+++ b/cnas-server/src/main/resources/mapper/StandardMethodMapper.xml
@@ -17,24 +17,51 @@
<select id="selectStandardMethodList" resultType="com.yuanchu.mom.pojo.StandardMethod">
select * from (
- select sm.id,
- sm.code,
- sm.name,
- sm.structure_test_object_id,
- sto.specimen_name sample_type,
- sm.remark,
- u1.name create_user_name,
- sm.create_time,
- u2.name update_user_name,
- sm.update_time,
- sm.is_product
- from standard_method sm
- left join user u1 on sm.create_user = u1.id
- left join user u2 on sm.update_user = u2.id
- left join structure_test_object sto on sm.structure_test_object_id = sto.id
- ) a
+ select sm.id,
+ sm.code,
+ sm.name,
+ sm.structure_test_object_id,
+ sto.specimen_name sample_type,
+ sm.remark,
+ u1.name create_user_name,
+ sm.create_time,
+ u2.name update_user_name,
+ sm.update_time,
+ sm.is_product,
+ sm.field,
+ sm.name_en,
+ sm.is_use,
+ sm.qualification_id
+ from standard_method sm
+ left join user u1 on sm.create_user = u1.id
+ left join user u2 on sm.update_user = u2.id
+ left join structure_test_object sto on sm.structure_test_object_id = sto.id
+ where sm.code != '濮旀墭瑕佹眰'
+ ) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
</select>
+ <select id="selectStandMethodById" resultType="com.yuanchu.mom.pojo.StandardMethod">
+ select sm.id,
+ sm.code,
+ sm.name,
+ sm.structure_test_object_id,
+ sto.specimen_name sample_type,
+ sm.remark,
+ u1.name create_user_name,
+ sm.create_time,
+ u2.name update_user_name,
+ sm.update_time,
+ sm.is_product,
+ sm.field,
+ sm.name_en,
+ sm.is_use,
+ sm.qualification_id
+ from standard_method sm
+ left join user u1 on sm.create_user = u1.id
+ left join user u2 on sm.update_user = u2.id
+ left join structure_test_object sto on sm.structure_test_object_id = sto.id
+ where sm.id = #{id}
+ </select>
</mapper>
--
Gitblit v1.9.3