lims-ruoyi-after.git

			@@ -178,60 +178,7 @@
			${ew.customSqlSegment}
			</if>
			</select>
			<select id="selectCostStatistics" resultType="com.ruoyi.inspect.dto.CostStatisticsDto">
			select * from (
			SELECT A.id,
			A.entrust_code,
			A.create_time,
			A.sample,
			A.model,
			A.inspection_item,
			A.company,
			A.`name`,
			COUNT(1) num,
			SUM(A.price) price,
			SUM(A.cost) cost
			FROM
			(SELECT
			i.id,
			i.entrust_code,
			i.create_time,
			isa.sample,
			isa.sample_code,
			isa.model,
			c.price,
			c.cost,
			c.inspection_item,
			i.company,
			u.`name`,
			i.create_user,
			c.ins_sample_id
			FROM
			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 custom cus on cus.id = u.company
			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 * ,
			GROUP_CONCAT(CONCAT(inspection_item,'@',inspection_item_subclass) SEPARATOR ',')inspection_item2 from ins_product where state = 1 and template_id IS NOT NULL GROUP BY ins_sample_id,man_hour_group) b GROUP
			BY b.ins_sample_id) c ON c.ins_sample_id = isa.id
			where (i.state = 1 or i.state = 3 or i.state = 4) and c.ins_sample_id IS not NULL)A
			GROUP BY
			A.id,
			A.entrust_code,
			A.create_time,
			A.sample,
			A.model,
			A.inspection_item,
			A.company,
			A.`name`
			) B
			<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
			${ew.customSqlSegment}
			</if>
			</select>

			<select id="selectDeviceList" resultType="java.util.Map">
			select device_name,
			en_device_name,
			@@ -272,28 +219,6 @@
			</if>
			</select>

			<select id="getCount" resultType="long">
			select count(1)
			from (
			SELECT io.entrust_code,sam.sample,ip.inspection_item,u.name,b.create_time, sam.id
			from ins_order io
			left JOIN ins_sample sam on io.id=sam.ins_order_id
			LEFT JOIN ins_product ip on ip.ins_sample_id=sam.id
			LEFT JOIN
			(SELECT create_time,create_user,ins_product_id FROM (select * FROM ins_product_user ORDER BY
			ins_product_user.create_time DESC) a GROUP BY a.ins_product_id) b
			on b.ins_product_id=ip.id
			left JOIN `user` u on u.id=b.create_user
			where (ip.ins_result=0 OR ip.state=0)
			<if test="inspectionItems != null and inspectionItems != ''">
			and inspection_item like concat('%', #{inspectionItems}, '%')
			</if>
			<if test="orderNumber != null and orderNumber != ''">
			and io.entrust_code like concat('%', #{orderNumber}, '%')
			</if>
			) temp
			</select>

			<select id="getStandardMethodCode" resultType="java.lang.String">
			select code
			from standard_method
			@@ -312,77 +237,6 @@
			where son_laboratory = #{laboratory}
			and ins_sample_id in
			(select id from ins_sample where ins_order_id = #{id}))
			</select>

			<select id="selectCostStatistics2" resultType="com.ruoyi.inspect.dto.CostStatisticsDto">
			select * from (
			SELECT A.id,
			A.entrust_code,
			A.create_time,
			A.sample,
			A.model,
			A.inspection_item,
			A.company,
			A.`name`,
			production,
			engineering,
			COUNT(1) num,
			SUM(A.price) price,
			SUM(A.cost) cost
			FROM
			(SELECT
			i.id,
			i.entrust_code,
			i.create_time,
			isa.sample,
			isa.sample_code,
			isa.model,
			c.price,
			c.cost,
			c.inspection_item,
			i.company,
			u.`name`,
			i.create_user,
			c.ins_sample_id,
			production,
			engineering
			FROM
			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 custom cus on cus.id = u.company
			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 * ,
			GROUP_CONCAT(CONCAT(inspection_item,'@',inspection_item_subclass) SEPARATOR ',')inspection_item2 from ins_product where state = 1 and template_id IS NOT NULL GROUP BY ins_sample_id,man_hour_group) b GROUP
			BY b.ins_sample_id) c ON c.ins_sample_id = isa.id
			where (i.state = 1 or i.state = 3 or i.state = 4) and c.ins_sample_id IS not NULL)A
			GROUP BY
			A.id,
			A.entrust_code,
			A.create_time,
			A.sample,
			A.model,
			A.inspection_item,
			A.company,
			A.`name`,
			production,
			engineering
			ORDER BY
			A.id,
			A.entrust_code,
			A.create_time,
			A.sample,
			A.model,
			A.inspection_item,
			A.company,
			A.`name`,
			production,
			engineering) B
			<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
			${ew.customSqlSegment}
			</if>
			</select>

			<select id="seldepLimsId" resultType="java.lang.String">