hy/mdc_hyjs_gk_new.git

			@@ -8,13 +8,13 @@
			t2.equipment_name
			FROM
			eam_report_repair t1
			LEFT JOIN eam_equipment t2 ON t1.equipment_id = t2.equipment_code
			LEFT JOIN eam_equipment t2 ON t1.equipment_id = t2.id
			<where>
			<choose>
			<when test="equipmentIds != null and equipmentIds.size() > 0 ">
			AND t1.equipment_id IN
			AND t2.equipment_code IN
			<foreach collection="equipmentIds" item="equipmentId" index="index" open="(" close=")" separator=",">
			{equipmentId}
			#{equipmentId}
			</foreach>
			</when>
			<otherwise>
			@@ -22,7 +22,10 @@
			</otherwise>
			</choose>
			<if test="eamReportRepair.equipmentId != null and eamReportRepair.equipmentId != ''">
			AND t1.equipment_id LIKE CONCAT(CONCAT('%',#{ eamReportRepair.equipmentId }),'%')
			AND t2.id = #{ eamReportRepair.equipmentId }
			</if>
			<if test="eamReportRepair.equipmentCode != null and eamReportRepair.equipmentCode != ''">
			AND t2.equipment_code LIKE CONCAT(CONCAT('%',#{ eamReportRepair.equipmentCode }),'%')
			</if>
			<if test="eamReportRepair.equipmentName != null and eamReportRepair.equipmentName != ''">
			AND t2.equipment_name = LIKE CONCAT(CONCAT('%',#{ eamReportRepair.equipmentName }),'%')
			@@ -43,6 +46,13 @@
			AND t1.fault_start_time BETWEEN #{ eamReportRepair.startTime } AND #{ eamReportRepair.endTime }
			</if>
			</where>
			ORDER BY t1.fault_start_time DESC
			ORDER BY t1.create_time DESC
			</select>
			<select id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamReportRepair">
			select wmo.*, e.equipment_code, e.equipment_name, e.installation_position
			from eam_report_repair wmo
			inner join eam_equipment e
			on wmo.equipment_id = e.id
			${ew.customSqlSegment}
			</select>
			</mapper>