tx-lims-after.git

			@@ -148,7 +148,8 @@
			order by type desc,io.id desc
			) a
			LEFT JOIN
			(SELECT r.id, r.ins_order_id, is_ratify, url, url_s,sample_code FROM ins_report r left join ins_sample isa on r.ins_sample_id = isa.id WHERE is_ratify = 1) ir ON a.id =
			(SELECT r.id, r.ins_order_id, is_ratify, url, url_s,sample_code FROM ins_report r left join ins_sample isa on
			r.ins_sample_id = isa.id WHERE is_ratify = 1) ir ON a.id =
			ir.ins_order_id )b
			<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
			${ew.customSqlSegment}
			@@ -192,8 +193,9 @@
			A.model,
			A.inspection_item,
			A.company,
			A.cost ,
			A.`name`,
			COUNT(1) num,
			COUNT(1) num,
			ROUND(SUM(A.price),2) price
			FROM (SELECT i.id,
			i.entrust_code,
			@@ -201,7 +203,8 @@
			isa.sample,
			isa.model,
			ins_sample_id,
			sum(c.price * times) price,
			times cost,
			sum(c.price * times) price,
			GROUP_CONCAT(distinct c.inspection_item SEPARATOR ',') inspection_item,
			i.company,
			u.`name`
			@@ -247,16 +250,7 @@
			${ew.customSqlSegment}
			</if>
			</select>
			<select id="selectDeviceList" resultType="java.util.Map">
			select device_name,specification_model,management_number,<!--DATE_ADD(date_format(last_calibration_date,
			'%Y-%m-%d'),INTERVAL calibration_date month)--> date_format(next_calibration_date,'%Y-%m-%d')
			latest_traceability
			from device
			where device.management_number in
			<foreach collection="names" index="index" open="(" separator="," close=")" item="val">
			#{val}
			</foreach>
			</select>


			<update id="upInsOrderParameter" parameterType="com.yuanchu.mom.pojo.InsOrder">
			UPDATE ins_order
			@@ -385,7 +379,7 @@
			A.inspection_item,
			A.company,
			A.`name`,
			COUNT(1) num,
			COUNT(1) num,
			ROUND(SUM(A.price),2) price
			FROM (SELECT i.id,
			i.entrust_code,
			@@ -393,7 +387,7 @@
			isa.sample,
			isa.model,
			ins_sample_id,
			sum(c.price * times) price,
			sum(c.price * times) price,
			GROUP_CONCAT(distinct c.inspection_item SEPARATOR ',') inspection_item,
			i.company,
			u.`name`
			@@ -452,4 +446,23 @@
			join user on prepare_user = name
			where ins_order.id = #{id}
			</select>

			<select id="selectDeviceList" resultType="com.yuanchu.mom.dto.DevListDto">
			select ROW_NUMBER() OVER (ORDER BY d.management_number) AS indexs,
			device_name AS name,
			specification_model AS model,
			management_number AS number,
			version,
			date_format(CASE
			WHEN dmr.next_calibration_date is not null THEN dmr.next_calibration_date
			WHEN d.next_calibration_date > CURDATE() THEN d.next_calibration_date
			END,'%Y-%m-%d') AS date
			from device d
			left join
			device_metric_record dmr on d.id = dmr.device_id
			where d.management_number in
			<foreach collection="names" index="index" open="(" separator="," close=")" item="val">
			#{val}
			</foreach>
			</select>
			</mapper>