lims-ruoyi-after.git

			@@ -25,6 +25,18 @@
			<resultMap id="LaboratoryDto" type="com.ruoyi.basic.dto.LaboratoryDto">
			<result property="label" column="laboratory"/>
			<result property="value" column="laboratory"/>
			<collection property="children" resultMap="ObjectTypeDto"/>
			</resultMap>

			<resultMap id="ObjectTypeDto" type="com.ruoyi.basic.dto.ObjectTypeDto">
			<result property="label" column="object_type"/>
			<result property="value" column="object_type"/>
			<collection property="children" resultMap="workShopNameDto"/>
			</resultMap>

			<resultMap id="workShopNameDto" type="com.ruoyi.basic.dto.WorkShopNameDto">
			<result property="label" column="workShopName"/>
			<result property="value" column="workShopName"/>
			<collection property="children" resultMap="SampleTypeDto"/>
			</resultMap>

			@@ -92,8 +104,10 @@
			</sql>

			<select id="selectStandardTreeList" resultMap="FactoryDto">
			select '中天科技检测中心' factory,
			select '中天科技' factory,
			l.laboratory_name laboratory,
			sto.object_type object_type,
			ws.`name` workShopName,
			sto.specimen_name sample_type,
			p.name sample,
			st.model,
			@@ -102,7 +116,6 @@
			sto.sort,
			sto.specimen_name_en sample_type_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
			@@ -169,7 +182,7 @@
			</if>
			</select>
			<select id="selectStandardTreeList2" resultType="com.ruoyi.basic.pojo.StandardTree">
			select '中天科技检测中心' factory,
			select '中天科技' factory,
			l.laboratory_name laboratory,
			sto.specimen_name sample_type,
			p.name sample
			@@ -250,8 +263,10 @@
			where name = #{name}
			</select>
			<select id="selectStandardTreeListByPartNo" resultMap="FactoryDto">
			select '中天科技检测中心' factory,
			select '中天科技' factory,
			l.laboratory_name laboratory,
			sto.object_type object_type,
			ws.`name` workShopName,
			sto.specimen_name sample_type,
			p.name sample,
			m.model_name model,