From 0644a19b927f4cd40ce45552b01064bb9b6521ad Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 31 十月 2024 13:53:22 +0800
Subject: [PATCH] 培训后优化

---
 inspect-server/src/main/resources/mapper/InsSampleMapper.xml |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
index 31aa13f..3aceb0e 100644
--- a/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsSampleMapper.xml
@@ -367,6 +367,7 @@
           and state = 1
           and ip.son_laboratory = #{laboratory}
           and ios.laboratory = #{laboratory}
+          and (ipr2.num is null or ipr.num is null)
     </select>
     <select id="getSampleEn" resultType="java.lang.String">
         select name_en
@@ -537,10 +538,12 @@
         ip.model ip_model,
         ip.state,
         io.issue_time,
+        u.name issueName,
         ins_sample_id
         from ins_sample isa
         left join ins_product ip on isa.id = ip.ins_sample_id
         left join ins_order io on io.id = ins_order_id
+        left join user u on io.issue_user = u.id
         where ip.state = 1
         and ins_order_id in
         <foreach collection="ids" open="(" close=")" item="id" separator=",">
@@ -853,6 +856,7 @@
         <result property="joinNum" column="join_num" jdbcType="INTEGER"/>
         <result property="remark" column="remark" jdbcType="VARCHAR"/>
         <result property="issueTime" column="issue_time" />
+        <result property="issueName" column="issueName" />
         <result property="createUser" column="create_user" jdbcType="INTEGER"/>
         <result property="updateUser" column="update_user" jdbcType="INTEGER"/>
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
@@ -950,4 +954,8 @@
           and state = 1
           and ins_order_id = #{insOrderId}
     </select>
+    <select id="selectList1" resultType="com.yuanchu.mom.dto.SampleProductDto">
+        select * from ins_sample where ins_order_id=#{id
+}
+    </select>
 </mapper>

--
Gitblit v1.9.3