tx-lims-after.git

			@@ -25,7 +25,7 @@
			</resultMap>

			<select id="findInsSampleAndOrder" resultType="com.yuanchu.mom.vo.InsOrderPlanVO">
			select * from(
			select * from(select * from(
			SELECT
			a.*,ios.ins_state,ios.verify_tell,isu2.order_user_id,(ios.verify_user = #{userId}) verify_user
			FROM
			@@ -63,6 +63,7 @@
			a.type DESC,
			a.id
			) b
			where ins_state is not null)A
			<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
			${ew.customSqlSegment}
			</if>
			@@ -207,7 +208,9 @@
			ipr.equip_name,
			ip.method_s,
			ip.tell,
			ip.dic
			ip.dic,
			ip.temperature,
			ip.humidity
			from ins_sample isa
			left join ins_product ip on isa.id = ip.ins_sample_id
			left join ins_product_result ipr on ip.id = ipr.ins_product_id
			@@ -448,7 +451,6 @@
			and ins_fibers_id is null
			</select>
			<select id="getReportModel" resultType="java.util.Map">

			</select>

			<resultMap id="sampleDto" type="com.yuanchu.mom.dto.SampleProductDto">
			@@ -516,6 +518,8 @@
			<result property="methodS" column="method_s"/>
			<result property="tell" column="tell"/>
			<result property="dic" column="dic"/>
			<result property="temperature" column="temperature"/>
			<result property="humidity" column="humidity"/>
			<collection property="insProductResult" resultMap="insProductResult"/>
			</resultMap>