From 562926922386bb24070ea27eb5a27193c41e996b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 18 四月 2024 14:46:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/resources/mapper/StandardMethodMapper.xml | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/cnas-server/src/main/resources/mapper/StandardMethodMapper.xml b/cnas-server/src/main/resources/mapper/StandardMethodMapper.xml
index bbb7fcb..3689b41 100644
--- a/cnas-server/src/main/resources/mapper/StandardMethodMapper.xml
+++ b/cnas-server/src/main/resources/mapper/StandardMethodMapper.xml
@@ -15,24 +15,27 @@
<result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
- <sql id="Base_Column_List">
- id,code,name,
- remark,create_user,create_time,
- update_user,update_time
- </sql>
<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.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
) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
--
Gitblit v1.9.3