430/mdc_430_new.git

			@@ -239,7 +239,7 @@
			AND t1.drive_type = #{mdcEquipment.driveType}
			</if>
			<if test="mdcEquipment.productionName != null and mdcEquipment.productionName != '' ">
			AND t3.production_name LIKE CONCAT(CONCAT('%',#{mdcEquipment.productionName}),'%')
			AND t3.id = #{ mdcEquipment.productionName } OR t3.parent_id = #{ mdcEquipment.productionName }
			</if>
			</where>
			order by t1.sort_no
			@@ -250,4 +250,34 @@
			select top 1 spindlespeed, actualspindlespeed from [${tableName}] order by CollectTime desc
			</select>

			<select id="exportXlsList" resultType="org.jeecg.modules.mdc.entity.MdcEquipment">
			SELECT
			t1.*
			FROM
			mdc_equipment t1
			LEFT JOIN mdc_production_equipment t2 ON t1.id = t2.equipment_id
			LEFT JOIN mdc_production t3 ON t2.production_id = t3.id
			<where>
			<if test="mdcEquipment.equipmentId != null and mdcEquipment.equipmentId != '' ">
			AND t1.equipment_id LIKE CONCAT(CONCAT('%',#{mdcEquipment.equipmentId}),'%')
			</if>
			<if test="mdcEquipment.equipmentName != null and mdcEquipment.equipmentName != '' ">
			AND t1.equipment_name LIKE CONCAT(CONCAT('%',#{mdcEquipment.equipmentName}),'%')
			</if>
			<if test="mdcEquipment.equipmentModel != null and mdcEquipment.equipmentModel != '' ">
			AND t1.equipment_name = #{mdcEquipment.equipmentModel}
			</if>
			<if test="mdcEquipment.equipmentType != null and mdcEquipment.equipmentType != '' ">
			AND t1.equipmentType = #{mdcEquipment.equipmentType}
			</if>
			<if test="mdcEquipment.driveType != null and mdcEquipment.driveType != '' ">
			AND t1.drive_type = #{mdcEquipment.driveType}
			</if>
			<if test="mdcEquipment.productionName != null and mdcEquipment.productionName != '' ">
			AND t3.id = #{ mdcEquipment.productionName } OR t3.parent_id = #{ mdcEquipment.productionName }
			</if>
			</where>
			order by t1.sort_no
			</select>

			</mapper>