From 01af9cb1c94e459184ad4d9836662094f14bac7e Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 16 四月 2024 00:15:27 +0800
Subject: [PATCH] 增加标准对于产品标准的区分,修复若干其她bug

---
 cnas-server/src/main/resources/mapper/StandardMethodMapper.xml |   11 +++++------
 1 files changed, 5 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..1dfd0d1 100644
--- a/cnas-server/src/main/resources/mapper/StandardMethodMapper.xml
+++ b/cnas-server/src/main/resources/mapper/StandardMethodMapper.xml
@@ -15,24 +15,23 @@
         <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
         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