From b97306686e7ac770ba7626dda6835838bdc9fc77 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 19 十二月 2024 15:38:44 +0800
Subject: [PATCH] cnas:1.添加检验下单审核通过后新增7.1检验委托单+2.添加报告编制批准通过后新增7.4报告结果+3.用户控制层一些常用的方法
---
inspect-server/src/main/resources/mapper/InsProductMapper.xml | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/inspect-server/src/main/resources/mapper/InsProductMapper.xml b/inspect-server/src/main/resources/mapper/InsProductMapper.xml
index dc00e69..ec40d61 100644
--- a/inspect-server/src/main/resources/mapper/InsProductMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsProductMapper.xml
@@ -6,7 +6,7 @@
<resultMap id="BaseResultMap" type="com.yuanchu.mom.pojo.InsProduct">
<id property="id" column="id" jdbcType="INTEGER"/>
<result property="inspectionItem" column="inspection_item" jdbcType="VARCHAR"/>
- <result property="inspectionItemClassify" column="inspection_item_classify" jdbcType="VARCHAR"/>
+ <result property="inspectionItemClass" column="inspection_item_class" jdbcType="VARCHAR"/>
<result property="inspectionItemSubclass" column="inspection_item_subclass" jdbcType="VARCHAR"/>
<result property="factory" column="factory" jdbcType="VARCHAR"/>
<result property="laboratory" column="laboratory" jdbcType="VARCHAR"/>
@@ -88,17 +88,6 @@
and template_id is not null
</select>
- <select id="selectFiberInsProduct" resultType="com.yuanchu.mom.pojo.InsProduct">
- select * from ins_product
- where state = 1
- and (ins_fibers_id is not null or ins_fiber_id is not null)
- and ins_result is null
- and son_laboratory = #{laboratory}
- and ins_sample_id in
- <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
- #{item}
- </foreach>
- </select>
<select id="selectNoProducts" resultType="com.yuanchu.mom.pojo.InsProduct">
select *
from (select ip.*, sample_code
@@ -108,4 +97,13 @@
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
+ where isa.id = #{sampleId}
+ and (ip.ins_result is null or ip.ins_result = 2)
+ and ip.state = 1
+ </select>
</mapper>
--
Gitblit v1.9.3