zgyw.git - Gitblit

			@@ -88,6 +88,9 @@
			<if test="query.start != null and query.end != null">
			AND wo.create_time BETWEEN #{query.start} AND #{query.end}
			</if>
			<if test="query.dept != null and query.dept != ''">
			AND wo.serial_number LIKE CONCAT(#{query.dept}, '%')
			</if>
			GROUP BY
			wo.id, wo.status, wo.work_order_no, wo.serial_number,wo.create_time, wo.unit_id, wo.yw_people_id,tm.name, wo.yw_handle_time, wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct,
			u.unit_name,
			@@ -162,7 +165,7 @@
			p.yw_person_name
			ORDER BY wo.work_order_no DESC
			</select>
			<select id="distributeList" resultMap="com.ycl.platform.domain.vo.WorkOrderVO">
			<select id="distributeList" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
			SELECT
			wo.id,wo.status, wo.work_order_no,wo.create_time, wo.unit_id, wo.yw_people_id, wo.yw_handle_time, wo.yw_result,
			wo.yw_check_result, wo.overtime, wo.deduct,
			@@ -187,7 +190,7 @@
			LEFT JOIN sys_user su ON su.user_id = odr.user_id
			WHERE
			wo.deleted = 0
			AND wo.create_time BETWEEN #{startDate} AND #{endDate}
			AND wo.status = 'WAIT_DISTRIBUTE'
			GROUP BY
			wo.id, wo.status, wo.work_order_no,wo.create_time, wo.unit_id, wo.yw_people_id, tm.name, wo.yw_handle_time,
			wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct,