tx-lims-after.git

			@@ -95,9 +95,11 @@
			ir.id report_id,
			ir.url,
			ir.url_s,
			concat(ROUND((select count(*) from ins_sample isa2
			where ins_state = 5 and isa2.ins_order_id = io.id) / (select count(*) from ins_sample isa2
			where isa2.ins_order_id = io.id) * 100, 2), '%') insProgress,
			(select count(*) from ins_sample isa2
			where isa2.ins_order_id = io.id) sample_num,
			concat(ROUND((select count(*) from ins_order_state ios
			where ins_state = 5 and ios.ins_order_id = io.id) / (select count(*) from ins_order_state ios2
			where ios2.ins_order_id = io.id) * 100, 2), '%') insProgress,
			group_concat(distinct isa.sample_code,' ') sample_code,
			group_concat(distinct isa.sample,' ') sample_name,
			group_concat(distinct isa.model,' ') sample_model
			@@ -152,9 +154,10 @@
			ins_order i
			LEFT JOIN ins_sample isa ON isa.ins_order_id = i.id
			LEFT JOIN `user` u ON u.id = i.user_id
			LEFT JOIN (select SUM(b.price) price, sum(b.man_hour) cost,b.ins_sample_id,GROUP_CONCAT(b.inspection_item
			LEFT JOIN (select SUM(b.price) price, sum(b.man_hour) cost,b.ins_sample_id,GROUP_CONCAT(b.inspection_item2
			SEPARATOR ',')
			inspection_item from (select * from ins_product where state = 1 GROUP BY ins_sample_id,man_hour_group) b GROUP
			inspection_item from (select *,GROUP_CONCAT(inspection_item
			SEPARATOR ',') inspection_item2 from ins_product where state = 1 GROUP BY ins_sample_id,man_hour_group) b GROUP
			BY b.ins_sample_id) c ON c.ins_sample_id = isa.id
			) a
			<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
			@@ -238,4 +241,8 @@
			select label from `center-lims`.enums
			where value = #{value}
			</select>
			<select id="getStandardMethodCode" resultType="java.lang.String">
			select code from `center-lims`.standard_method
			where id = #{id}
			</select>
			</mapper>