hy/mdc_hyjs_gk_new.git

			@@ -9,8 +9,12 @@
			a.EquipmentID equipmentId,
			me.equipment_name equipmentName,
			me.equipment_type equipmentType,
			met.equipment_type_pictures equipmentImage,
			a.Oporation equipmentStatus,
			me.equipment_image equipmentImage,
			CASE

			WHEN repair.count > 0 THEN
			'5' ELSE a.Oporation
			END AS equipmentStatus,
			mew.coordinate_left coordinateLeft,
			mew.coordinate_top coordinateTop,
			mew.vw vw,
			@@ -18,12 +22,23 @@
			me.id equId
			FROM
			EquipmentLog a
			INNER JOIN ( SELECT EquipmentID, MAX ( CollectTime ) 'maxgdtime' FROM EquipmentLog GROUP BY EquipmentID ) b ON a.EquipmentID= b.EquipmentID
			INNER JOIN mdc_workshop_equipment mew ON mew.equipment_id = a.EquipmentID
			INNER JOIN mdc_equipment me ON me.equipment_id = a.EquipmentID
			INNER JOIN mdc_equipment_type met ON me.equipment_type = met.equipment_type_name
			AND a.CollectTime= b.maxgdtime
			AND mew.workshop_id = #{ workshopId }
			INNER JOIN ( SELECT EquipmentID, MAX ( CollectTime ) 'maxgdtime' FROM EquipmentLog GROUP BY EquipmentID ) b ON a.EquipmentID= b.EquipmentID
			INNER JOIN mdc_workshop_equipment mew ON mew.equipment_id = a.EquipmentID
			INNER JOIN mdc_equipment me ON me.equipment_id = a.EquipmentID
			INNER JOIN mdc_equipment_type met ON me.equipment_type = met.equipment_type_name
			AND a.CollectTime= b.maxgdtime
			AND mew.workshop_id = #{ workshopId }
			LEFT JOIN (
			SELECT
			e1.equipment_code,
			COUNT(1) COUNT
			FROM
			eam_report_repair r1
			INNER JOIN eam_equipment e1 ON e1.id = r1.equipment_id
			WHERE
			r1.report_status NOT IN ('COMPLETE', 'ABOLISH')
			GROUP BY
			e1.equipment_code) repair ON repair.equipment_code = me.equipment_id
			</select>

			<select id="listByUser" resultType="org.jeecg.modules.mdc.entity.MdcWorkshopInfo">