zgyw.git - Gitblit

			@@ -42,13 +42,16 @@
			t_work_order wo
			INNER JOIN t_monitor tm ON wo.serial_number = tm.serial_number
			INNER JOIN t_work_order_error_type et ON wo.work_order_no = et.work_order_no
			INNER JOIN t_yw_unit u ON wo.unit_id = u.id AND u.deleted = 0
			INNER JOIN sys_dict_data da ON da.dict_value = et.error_name AND da.dict_type = 'error_type' <if test="query.errorTypeList != null and query.errorTypeList.size() > 0">AND da.dict_value in <foreach
			collection="query.errorTypeList" open="(" separator="," close=")" item="errorType">#{errorType}</foreach> </if>
			LEFT JOIN t_work_order_check_img ci ON ci.work_order_no = wo.work_order_no
			LEFT JOIN t_yw_unit u ON wo.unit_id = u.id AND u.deleted = 0
			LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id AND p.deleted = 0
			WHERE
			wo.deleted = 0
			<if test="query.unitId != null">
			AND wo.unit_id = #{query.unitId}
			</if>
			<if test="query.workOrderNo != null and query.workOrderNo != ''">
			AND wo.work_order_no = #{query.workOrderNo}
			</if>
			@@ -87,7 +90,7 @@
			INNER JOIN t_work_order_error_type et ON wo.work_order_no = et.work_order_no
			INNER JOIN sys_dict_data da ON da.dict_value = et.error_name AND da.dict_type = 'error_type' <if test="query.errorTypeList != null and query.errorTypeList.size() > 0">AND da.dict_value in <foreach
			collection="query.errorTypeList" open="(" separator="," close=")" item="errorType">#{errorType}</foreach> </if>
			LEFT JOIN t_yw_unit u ON wo.unit_id = u.id and u.deleted = 0
			INNER JOIN t_yw_unit u ON wo.unit_id = u.id and u.deleted = 0
			LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id and p.deleted = 0
			LEFT JOIN t_work_order_distribute_record odr ON odr.work_order_no = wo.work_order_no AND odr.deleted = 0
			LEFT JOIN sys_user su ON su.user_id = odr.user_id