new-LIMS-after.git

			@@ -4,6 +4,22 @@
			"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
			<mapper namespace="com.ruoyi.inspect.mapper.InsOrderMapper">

			<select id="selectQualityMonitorEvaluatorId" resultType="java.lang.Integer">
			SELECT cqmd.evaluator_user_id
			FROM ins_order io
			JOIN cnas_quality_monitor_details cqmd
			ON cqmd.quality_monitor_details_id = io.quality_monitor_details_id
			WHERE io.id = #{orderId}
			</select>

			<select id="selectQualityMonitorInspectorId" resultType="java.lang.Integer">
			SELECT cqmd.inspector_user_id
			FROM ins_order io
			JOIN cnas_quality_monitor_details cqmd
			ON cqmd.quality_monitor_details_id = io.quality_monitor_details_id
			WHERE io.id = #{orderId}
			</select>

			<resultMap id="selectSampleDefectsMap" type="com.ruoyi.inspect.vo.SampleDefectsFatherVo">
			<id column="id" property="id"/>
			<result column="sample" property="sample"/>
			@@ -246,6 +262,7 @@
			en_device_name,
			specification_model,
			management_number,
			factory_no,
			date_format(activation_date,'%Y-%m-%d')
			latest_traceability
			from device
			@@ -416,7 +433,7 @@
			from (select io2.id insOrderId,
			io2.sample_view,
			io2.production,
			io2.send_time,
			io2.sample_date,
			GROUP_CONCAT(DISTINCT isa.model SEPARATOR ' ') AS sample_model,
			io2.prepare_user,
			io2.entrust_code,