From 9490c47566a0f253f35a1019fd1b1e1473630d67 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 20 一月 2025 09:48:53 +0800
Subject: [PATCH] Merge branch 'dev'
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 75 +++++++++++++++++++++++++++++--------
1 files changed, 58 insertions(+), 17 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 1b74f97..5a5c238 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -68,12 +68,15 @@
<if test="query.unitId != null">
AND wo.unit_id = #{query.unitId}
</if>
- <if test="query.errorType != null and query.errorType != ''">
+ <if test="query.errorTypeList != null and query.errorTypeList.size>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 = #{query.errorType}
+ AND twoet.error_name in
+ <foreach collection="query.errorTypeList" open="(" close=")" separator="," item="errorType">
+ #{errorType}
+ </foreach>
))
</if>
<if test="query.keyword != null and query.keyword != ''">
@@ -92,7 +95,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 +114,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
@@ -135,12 +145,15 @@
<if test="query.start != null and query.end != null">
AND wo.create_time BETWEEN #{query.start} AND #{query.end}
</if>
- <if test="query.errorType != null and query.errorType !='' ">
+ <if test="query.errorTypeList != null and query.errorTypeList.size>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 = #{query.errorType}
+ AND twoet.error_name in
+ <foreach collection="query.errorTypeList" open="(" close=")" separator="," item="errorType">
+ #{errorType}
+ </foreach>
))
</if>
GROUP BY
@@ -149,7 +162,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 +169,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 +216,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 +271,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 +288,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 +305,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 +317,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 +332,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 +347,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,12 +359,16 @@
</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
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
- WHERE wo.deleted = 0 AND wo.status = #{status} AND woar.result = #{auditStatus}
- AND wo.deduct = 0 AND woar.create_time between #{startTime} and #{endTime}
+ LEFT JOIN t_work_order_auditing_record woar ON woar.work_order_no = wo.work_order_no and woar.result = #{auditStatus}
+ WHERE wo.deleted = 0 AND wo.deduct = 0 AND wo.status = #{status}
+ AND woet.error_name in
+ <foreach collection="errorList" item="error" separator="," open="(" close=")">
+ #{error}
+ </foreach>
+ AND woar.create_time between #{startTime} and #{endTime}
</select>
<update id="updateMany">
@@ -444,4 +471,18 @@
</foreach>
</where>
</select>
+
+ <select id="getAuditTimeList" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
+ select work_order_no ,create_time as auditTime from t_work_order_auditing_record where work_order_no in
+ <foreach collection="workOrderNos" item="no" open="(" close=")" separator=",">
+ #{no}
+ </foreach>
+ </select>
+ <select id="getHandleTimeList" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
+ select work_order_no ,create_time as handleTime from t_work_order_yw_condition_record
+ where sys_msg = 0 and work_order_no in
+ <foreach collection="workOrderNos" item="no" open="(" close=")" separator=",">
+ #{no}
+ </foreach>
+ </select>
</mapper>
--
Gitblit v1.8.0