From 9183a9a18a910d5b099119240a86a3a87ce42106 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 05 八月 2024 20:41:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/InsProductMapper.xml | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsProductMapper.xml b/inspect-server/src/main/resources/mapper/InsProductMapper.xml
index d1e6308..5d9645a 100644
--- a/inspect-server/src/main/resources/mapper/InsProductMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsProductMapper.xml
@@ -3,7 +3,6 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.InsProductMapper">
-
<resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsProduct">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="inspectionItem" column="inspection_item" jdbcType="VARCHAR"/>
@@ -78,7 +77,7 @@
io.entrust_code,
ipr.update_time,
ip.ins_result,
- u.name updateUserName
+ u.name updateUserName
from ins_product ip
left join ins_product_result ipr on ip.id = ipr.ins_product_id
left join ins_sample isa on isa.id = ip.ins_sample_id
@@ -86,7 +85,7 @@
left join user u on u.id = ipr.update_user
where ip.ins_sample_id = #{sampleId}
and ip.ins_result is not null
- and template_id is not null
+ and template_id is not null
</select>
<select id="selectFiberInsProduct" resultType="com.yuanchu.mom.pojo.InsProduct">
select * from ins_product
@@ -99,4 +98,13 @@
#{item}
</foreach>
</select>
+ <select id="selectNoProducts" resultType="com.yuanchu.mom.pojo.InsProduct">
+ select *
+ from (select ip.*, sample_code
+ from ins_product ip
+ left join ins_sample is2 on ip.ins_sample_id = is2.id
+ where ip.ins_result is null
+ and state = 1
+ and is2.ins_order_id = #{orderId}) A
+ </select>
</mapper>
--
Gitblit v1.9.3