From d9d70577933e9cd021b4ff6d26c576d6dbd9161a Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 28 八月 2024 17:54:41 +0800
Subject: [PATCH] 点播定时任务优化
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 120 ++++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 84 insertions(+), 36 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 4111b0c..87fad71 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -11,64 +11,80 @@
<result column="yw_people_id" property="ywPeopleId"/>
<result column="yw_handle_time" property="ywHandleTime"/>
<result column="yw_result" property="ywResult"/>
- <result column="yw_condition" property="ywCondition"/>
<result column="yw_check_result" property="ywCheckResult"/>
<result column="overtime" property="overtime"/>
<result column="deduct" property="deduct"/>
- <collection property="errorTypeList" select="getErrorType" ofType="string" column="work_order_no">
- </collection>
+ <result column="errorType" property="errorType"/>
+ <result column="status" property="status"/>
+ <result column="source" property="source"/>
+<!-- <collection property="errorTypeList" select="getErrorType" column="{workOrderNo=work_order_no,errList=errList}" ofType="string"/>-->
</resultMap>
<select id="getErrorType" resultType="string">
SELECT DISTINCT da.dict_label
FROM
t_work_order_error_type et
- LEFT JOIN sys_dict_data da ON da.dict_value = et.error_name AND da.dict_type = 'error_type'
- WHERE et.work_order_no = #{work_order_no}
+ LEFT JOIN sys_dict_data da ON da.dict_value = et.error_name AND da.dict_type = 'error_type' <if test="errList != null and errList.size() > 0">AND da.dict_value in <foreach
+ collection="errList" open="(" separator="," close=")" item="errorType">#{errorType}</foreach> </if>
+ WHERE et.work_order_no = #{workOrderNo}
</select>
<select id="page" resultMap="BaseResultMap">
SELECT
- wo.*,
- u.unit_name,
- p.yw_person_name
+ 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,
+ u.unit_name,
+ p.yw_person_name,
+ tm.name as source,
+ GROUP_CONCAT(DISTINCT da.dict_label ORDER BY da.dict_label SEPARATOR ',') AS errorType
FROM
- t_work_order wo
- 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>
- <if test="query.status != null">
- AND wo.status = #{query.status}
- </if>
- <if test="query.errorType != null and query.errorType != ''">
- AND wo.error_type = #{query.errorType}
- </if>
- <if test="query.start != null">
- AND wo.yw_handle_time BETWEEN #{query.start} AND #{query.end}
- </if>
+ 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 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
+ 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>
+ <if test="query.status != null">
+ AND wo.status = #{query.status}
+ </if>
+ <!-- 娉ㄦ剰锛氳繖閲岀Щ闄や簡瀵筿uery.errorType鐨勭洿鎺ユ煡璇紝鍥犱负瀹冪幇鍦ㄩ�氳繃JOIN鍜孏ROUP_CONCAT澶勭悊 -->
+ <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,
+ u.unit_name,
+ p.yw_person_name
ORDER BY wo.create_time DESC
</select>
<select id="distributePage" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
SELECT
- wo.*,
- u.unit_name,
+ 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,
+ u.unit_name,
p.yw_person_name,
yp.province_tag,
yp.important_tag,
yp.important_command_image_tag,
odr.create_time as distributeTime,
- su.nick_name as realName
+ su.nick_name as realName,
+ tm.name as source,
+ GROUP_CONCAT(DISTINCT da.dict_label ORDER BY da.dict_label SEPARATOR '銆�') AS errorType
FROM
t_work_order wo
+ INNER JOIN t_monitor tm ON wo.serial_number = tm.serial_number
+ INNER JOIN t_yw_point yp ON yp.serial_number = wo.serial_number AND yp.deleted = 0
+ 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
LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id and p.deleted = 0
- INNER JOIN t_yw_point yp ON yp.serial_number = wo.serial_number AND yp.deleted = 0
- LEFT JOIN t_work_order_distribute_record odr ON odr.work_order_id = wo.id AND odr.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
WHERE
wo.deleted = 0
@@ -78,6 +94,18 @@
<if test="query.status != null and query.status != ''">
AND wo.status = #{query.status}
</if>
+ <if test="query.keyword != null and query.keyword != ''">
+ AND (tm.name like concat('%', #{query.keyword}, '%') or tm.serial_number like concat('%', #{query.keyword}, '%'))
+ </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,
+ 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>
@@ -91,7 +119,7 @@
FROM
t_work_order wo
INNER JOIN t_yw_point yp ON yp.serial_number = wo.serial_number AND yp.deleted = 0
- INNER JOIN t_work_order_distribute_record wod ON wod.work_order_id = wo.id
+ INNER JOIN t_work_order_distribute_record wod ON wod.work_order_no = wo.work_order_no
WHERE
wo.status = 'DISTRIBUTED' AND wo.deleted = 0
</select>
@@ -162,7 +190,8 @@
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 = 'province' </if>
+ <if test="dataScope == 1"> AND p.province_tag = 1 </if>
+ <if test="dataScope == 3"> AND p.important_tag = 1 </if>
<if test="deptId != null"> AND p.dept_id = #{deptId} </if>
</select>
@@ -176,7 +205,8 @@
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 = 'province' </if>
+ <if test="dataScope == 1"> AND p.province_tag = 1 </if>
+ <if test="dataScope == 3"> AND p.important_tag = 1 </if>
<!-- <if test="deptId != null"> AND p.dept_id = #{deptId} </if> -->
GROUP BY d.area, d.dept_id
ORDER BY d.dept_id
@@ -185,11 +215,11 @@
<select id="hasErrorWorkOrderList" resultType="com.ycl.platform.domain.vo.DeviceInfoVO">
SELECT
wo.id as workOrderId,
- di.device_id,
- di.channel_id
+ wo.serial_number as deviceId
FROM
t_work_order wo
- INNER JOIN t_device_info di ON wo.serial_number = di.device_id
+ WHERE
+ deleted = 0
</select>
<insert id="addMany">
@@ -199,4 +229,22 @@
</foreach>
</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
+ 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_id = wo.id
+ WHERE wo.deleted = 0 AND wo.status = #{status} AND woar.result = #{auditStatus}
+ AND wo.deduct = 0 AND woar.create_time between #{startTime} and #{endTime}
+ </select>
+
+ <update id="updateMany">
+ <foreach collection="workOrderList" separator=";" item="item">
+ UPDATE t_work_order
+ SET
+ update_time = #{item.updateTime},
+ status = #{item.status}
+ WHERE id = #{item.id}
+ </foreach>
+ </update>
</mapper>
--
Gitblit v1.8.0