From 0e2e829f10a5e5b239d6583d6be3afbcaed0dcc0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 31 七月 2024 17:58:30 +0800
Subject: [PATCH] PK8000处理调试+各种bug调试优化

---
 inspect-server/src/main/resources/mapper/InsReportMapper.xml |   29 +++++++++++++++++++++++------
 1 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/inspect-server/src/main/resources/mapper/InsReportMapper.xml b/inspect-server/src/main/resources/mapper/InsReportMapper.xml
index 8bde742..f77f31c 100644
--- a/inspect-server/src/main/resources/mapper/InsReportMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsReportMapper.xml
@@ -19,10 +19,27 @@
             <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
     </resultMap>
 
-    <sql id="Base_Column_List">
-        id,ins_order_id,url,
-        url_s,is_ratify,is_examine,
-        ratify_user_id,examine_user_id,create_user,
-        update_user,create_time,update_time
-    </sql>
+    <select id="pageInsReport" resultType="com.yuanchu.mom.dto.ReportPageDto">
+        select *
+        from (
+        select
+        ir.*,io.entrust_code,u.name write_user_name,u1.name ratify_user,u2.name examine_user
+        from ins_report ir
+        left join ins_order io on io.id = ir.ins_order_id
+        left join user u on u.id = ir.write_user_id
+        left join user u1 on u1.id = ir.ratify_user_id
+        left join user u2 on u2.id = ir.examine_user_id
+        ) a
+        <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+            ${ew.customSqlSegment}
+        </if>
+    </select>
+    <select id="getLaboratoryByName" resultType="java.lang.String">
+        select s.address from seal s
+        left join laboratory l on s.lab_id = l.id
+        where l.laboratory_name = #{name}
+        and s.type = '鎶ュ憡绫诲瀷'
+        order by s.create_time desc
+        limit 1
+    </select>
 </mapper>

--
Gitblit v1.9.3