tx-lims-after.git

			@@ -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"/>
			@@ -71,11 +71,12 @@
			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
			from ins_product ip
			@@ -84,19 +85,8 @@
			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
			</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 *
			@@ -107,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>