lims-ruoyi-after.git

			@@ -35,6 +35,8 @@
			<result property="sort" column="sort"/>
			<result property="partNo" column="part_no"/>
			<result property="sampleTypeEn" column="sample_type_en"/>
			<result property="workShopName" column="workShopName"/>
			<result property="workShopId" column="workShopId"/>
			<collection property="children" resultMap="SampleDto"/>
			</resultMap>

			@@ -99,12 +101,15 @@
			sto.id sample_type_id,
			sto.sort,
			sto.specimen_name_en sample_type_en,
			p.name_en sample_en
			p.name_en sample_en,
			ws.`name` workShopName,
			ws.id workShopId
			from laboratory l
			left join structure_test_object sto on sto.laboratory_id = l.id
			left join product p on p.object_id = sto.id
			left join standard_tree st on st.sample_type = sto.specimen_name
			and st.sample = p.name
			LEFT JOIN work_shop ws ON ws.id = sto.work_shop_id
			order by l.id, CAST(sto.code AS DECIMAL), p.id, ISNULL(st.id), st.id
			</select>

			@@ -249,7 +254,9 @@
			l.laboratory_name laboratory,
			sto.specimen_name sample_type,
			p.name sample,
			st.model,
			m.model_name model,
			ws.`name` workShopName,
			ws.id workShopId,
			CASE
			WHEN p.id = (SELECT pp.product_id
			FROM product_part pp
			@@ -269,6 +276,8 @@
			left join product p on p.object_id = sto.id
			left join standard_tree st on st.sample_type = sto.specimen_name
			and st.sample = p.name
			LEFT JOIN model m ON m.product_id = p.id
			LEFT JOIN work_shop ws ON ws.id = sto.work_shop_id
			where (p.id = (select pp.product_id
			from product_part pp
			where pp.part_no = #{partNo})
			@@ -389,4 +398,12 @@
			</foreach>
			</if>
			</select>

			<select id="getStandardTree3" resultType="com.ruoyi.basic.dto.SampleDto">
			select model label,
			model value
			from standard_tree
			where sample_type = #{sampleType}
			and sample is null
			</select>
			</mapper>