zgyw.git - Gitblit

			@@ -32,7 +32,17 @@

			<select id="page" resultMap="BaseResultMap">
			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,
			wo.id,wo.status,
			wo.work_order_no,
			wo.serial_number,
			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,
			u.unit_name,
			p.yw_person_name,
			tm.name as source,
			@@ -42,27 +52,27 @@
			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.workOrderNo != null and query.workOrderNo != ''">
			AND wo.work_order_no = #{query.workOrderNo}
			<if test="query.unitId != null">
			AND wo.unit_id = #{query.unitId}
			</if>
			<if test="query.keyword != null and query.keyword != ''">
			AND (wo.work_order_no like concat('%', #{query.keyword}, '%') or tm.name like concat('%', #{query.keyword}, '%'))
			</if>
			<if test="query.status != null and query.status != ''">
			AND wo.status = #{query.status}
			</if>
			<if test="query.status == null or query.status == ''">
			AND wo.status = 'DISTRIBUTED'
			</if>
			<if test="query.start != null">
			AND wo.yw_handle_time BETWEEN #{query.start} AND #{query.end}
			</if>
			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,
			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,
			p.yw_person_name
			ORDER BY wo.create_time DESC
			@@ -87,7 +97,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
			@@ -95,6 +105,9 @@
			wo.deleted = 0
			<if test="query.unitId != null">
			AND wo.unit_id = #{query.unitId}
			</if>
			<if test="query.unitId == null">
			AND wo.unit_id is not null
			</if>
			<if test="query.status != null and query.status != ''">
			AND wo.status = #{query.status}
			@@ -190,8 +203,8 @@
			<select id="workOrderTotal" resultType="com.ycl.platform.domain.vo.screen.WorkOrderTotalVO">
			SELECT
			COUNT(*) AS totalNum,
			COUNT(IF(w.status = 'DISTRIBUTED', 1, NULL)) + COUNT(IF(w.status = 'AUDITING_FAIL', 1, NULL)) + COUNT(IF(w.status = 'WAIT_DISTRIBUTE', 1, NULL)) AS todoNum,
			COUNT(IF(w.status = 'YW_HANDLE', 1, NULL)) + COUNT(IF(w.status = 'AUDITING_SUCCESS', 1, NULL)) + COUNT(IF(w.status = 'AUDITING', 1, NULL)) AS doneNum
			COUNT(IF(w.status != 'AUDITING_SUCCESS' and w.status != 'WAIT_DISTRIBUTED', 1, NULL)) AS todoNum,
			COUNT(IF(w.status = 'AUDITING_SUCCESS', 1, NULL)) AS doneNum
			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
			@@ -225,7 +238,7 @@
			FROM
			t_work_order wo
			WHERE
			wo.create_time BETWEEN #{start} AND #{end}
			wo.create_time BETWEEN #{start} AND #{end} AND wo.status = 'AUDITING'
			AND deleted = 0
			</select>

			@@ -283,4 +296,47 @@
			<result column="status" property="status" typeHandler="com.baomidou.mybatisplus.core.handlers.MybatisEnumTypeHandler"/>
			<result column="error_names" property="errorType"/>
			</resultMap>

			<select id="detailByNo" resultType="com.ycl.platform.domain.vo.WorkOrderDetailVO">
			SELECT
			wo.id,
			wo.work_order_no,
			wo.serial_number,
			dr.create_time as distributeTime,
			m.name as source,
			yw.unit_name,
			yw.unit_contact,
			yw.unit_contact_phone,
			wo.overtime,
			wo.processing_period,
			wo.status
			FROM
			t_work_order wo
			INNER JOIN t_work_order_distribute_record dr ON wo.work_order_no = dr.work_order_no AND dr.deleted = 0 AND wo.work_order_no = #{workOrderNo}
			INNER JOIN t_monitor m ON m.serial_number = wo.serial_number
			LEFT JOIN t_yw_unit yw ON yw.id = wo.unit_id AND yw.deleted = 0
			</select>
			<select id="getRecoveryInfo" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
			SELECT
			wo.work_order_no,
			u.unit_name,
			u.unit_contact,
			u.unit_contact_phone,
			p.yw_person_name,
			GROUP_CONCAT(DISTINCT da.dict_label ORDER BY da.dict_label SEPARATOR ',') AS errorType
			FROM
			t_work_order wo
			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'
			LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id AND p.deleted = 0
			WHERE
			wo.deleted = 0
			GROUP BY
			wo.work_order_no,
			u.unit_name,
			u.unit_contact,
			u.unit_contact_phone,
			p.yw_person_name
			</select>
			</mapper>