From 22d3a8dc4185c5461bee9e42a9f4a2775ff448e6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 10 九月 2024 17:28:17 +0800
Subject: [PATCH] 报告更改+再次试验
---
inspect-server/src/main/resources/mapper/InsProductMapper.xml | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsProductMapper.xml b/inspect-server/src/main/resources/mapper/InsProductMapper.xml
index d1e6308..4394f11 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"/>
@@ -72,21 +71,22 @@
select ip.id,
ip.inspection_item,
ip.inspection_item_subclass,
- ip.laboratory,
+ ip.son_laboratory,
ip.unit,
ipr.equip_name equipValue,
io.entrust_code,
ipr.update_time,
+ ip.`last_value`,
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
left join ins_order io on io.id = isa.ins_order_id
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 +99,23 @@
#{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>
+
+ <select id="selectInsProductCountByOrderId" resultType="int">
+ select COUNT(1)
+ from ins_product ip
+ left join ins_sample isa on ip.ins_sample_id = isa.id
+ left join ins_order io on isa.ins_order_id = io.id
+ where io.id = #{orderId}
+ and (ip.ins_result is null or ip.ins_result = 2)
+ and ip.state = 1
+ </select>
</mapper>
--
Gitblit v1.9.3