zgyw.git - Gitblit

			@@ -92,7 +92,7 @@
			ORDER BY wo.work_order_no DESC
			</select>

			<select id="export" resultMap="BaseResultMap">
			<select id="export" resultType = "com.ycl.platform.domain.vo.WorkOrderVO">
			SELECT
			wo.id,wo.status,
			wo.work_order_no,
			@@ -111,11 +111,18 @@
			p.yw_person_name,
			tm.name as source,
			tm.ip as ip,
			yp.province_tag_video,
			yp.province_tag_car,
			yp.province_tag_face,
			yp.important_tag,
			yp.important_command_image_tag,
			yp.dept_tag,
			GROUP_CONCAT(DISTINCT da.dict_label ORDER BY da.dict_label SEPARATOR ',') AS errorType,
			GROUP_CONCAT(DISTINCT ci.img_url ORDER BY ci.create_time DESC SEPARATOR ',') AS imgListStr
			FROM
			t_work_order wo
			INNER JOIN t_monitor tm ON wo.serial_number = tm.serial_number
			INNER JOIN t_yw_point yp ON wo.serial_number = yp.serial_number
			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'
			INNER JOIN t_yw_unit u ON wo.unit_id = u.id AND u.deleted = 0
			@@ -149,7 +156,6 @@
			p.yw_person_name
			ORDER BY wo.work_order_no DESC
			</select>

			<select id="distributePage" 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,
			@@ -157,7 +163,6 @@
			u.unit_name,
			p.yw_person_name,
			yp.serial_number,
			yp.province_tag,
			yp.important_tag,
			yp.important_command_image_tag,
			odr.create_time as distributeTime,
			@@ -205,19 +210,28 @@
			wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct,
			u.unit_name,
			p.yw_person_name,
			yp.province_tag,
			yp.important_tag,
			yp.important_command_image_tag,
			odr.create_time,
			su.nick_name
			ORDER BY wo.create_time DESC
			</select>

			<select id="getOfflineWorkOrder" resultType="java.lang.String">
			select tm.ip
			FROM t_work_order wo
			INNER JOIN t_monitor tm ON wo.serial_number = tm.serial_number
			where wo.status != 'AUDITING_SUCCESS' and wo.deleted = 0
			AND (EXISTS (
			SELECT 1
			FROM t_work_order_error_type twoet
			WHERE twoet.work_order_no = wo.work_order_no
			AND twoet.error_name = 'DEVICEOFFLINE'
			))
			</select>
			<select id="handlingWorkOrderList" resultType="com.ycl.platform.domain.vo.YwPointJobVO">
			SELECT
			wo.id,
			wod.create_time,
			yp.province_tag,
			yp.important_tag,
			yp.important_command_image_tag
			FROM
			@@ -251,6 +265,7 @@
			WHERE DATE_FORMAT(w.create_time, '%Y') = DATE_FORMAT(NOW(), '%Y')
			AND w.deleted = 0 AND unit_id = #{unitId}
			GROUP BY dateType
			ORDER BY dateType
			</if>

			<if test="dateType == 'week'">
			@@ -267,6 +282,7 @@
			w.create_time BETWEEN DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) DAY) AND DATE_ADD(CURDATE(), INTERVAL (6 - WEEKDAY(CURDATE())) DAY)
			AND w.deleted = 0 AND unit_id = #{unitId}
			GROUP BY dateType
			ORDER BY dateType
			</if>

			<if test="dateType == 'day'">
			@@ -283,6 +299,7 @@
			DATE_FORMAT(w.create_time, '%Y-%m-%d') BETWEEN DATE_FORMAT(CURDATE(), '%Y-%m-01') AND LAST_DAY(CURDATE())
			AND w.deleted = 0 AND unit_id = #{unitId}
			GROUP BY dateType
			ORDER BY dateType
			</if>
			</select>

			@@ -294,7 +311,7 @@
			FROM t_work_order w
			LEFT JOIN t_yw_point p ON w.serial_number = p.serial_number AND p.deleted = 0
			WHERE w.deleted = 0
			<if test="dataScope == 1"> AND p.province_tag = 1 </if>
			<if test="dataScope == 1"> AND (p.province_tag_video = 1 or p.province_tag_car = 1 or p.province_tag_face = 1)</if>
			<if test="dataScope == 3"> AND p.dept_tag = 1 </if>
			<if test="deptId != null"> AND p.dept_id = #{deptId} </if>
			</select>
			@@ -309,7 +326,7 @@
			LEFT JOIN t_yw_point p ON p.dept_id = d.dept_id AND p.deleted = 0
			LEFT JOIN t_work_order w ON w.serial_number = p.serial_number AND w.deleted = 0
			WHERE d.del_flag = 0 AND d.area IS NOT NULL
			<if test="dataScope == 1"> AND p.province_tag = 1 </if>
			<if test="dataScope == 1"> AND (p.province_tag_video = 1 or p.province_tag_car = 1 or p.province_tag_face = 1)</if>
			<if test="dataScope == 3"> AND p.dept_tag = 1 </if>
			<!-- <if test="deptId != null"> AND p.dept_id = #{deptId} </if> -->
			GROUP BY d.area, d.dept_id
			@@ -324,7 +341,7 @@
			FROM
			t_work_order wo
			WHERE
			wo.status = 'YW_HANDLE'
			(wo.status = 'YW_HANDLE' or wo.status ='DISTRIBUTED' )
			AND wo.deleted = 0
			</select>

			@@ -336,7 +353,7 @@
			</insert>

			<select id="selectPassOrder" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
			SELECT wo.id,wo.work_order_no,wo.unit_id,woet.error_name as errorType,woet.distribute_time,woar.create_time as auditTime
			SELECT wo.id,wo.work_order_no,wo.unit_id,woet.error_name as errorType,woet.create_time as distributeTime,woar.create_time as auditTime
			FROM t_work_order wo
			LEFT JOIN t_work_order_error_type woet ON woet.work_order_no = wo.work_order_no
			LEFT JOIN t_work_order_auditing_record woar ON woar.work_order_no = wo.work_order_no