From bb4c01a00c8203fdadf38aca9290227f6682655f Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 02 九月 2024 17:55:33 +0800
Subject: [PATCH] 宇视OSD打通，OSD整体打通
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 50 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 43 insertions(+), 7 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index da3a49f..7dd7578 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -17,6 +17,7 @@
<result column="errorType" property="errorType"/>
<result column="status" property="status"/>
<result column="source" property="source"/>
+ <result column="imgListStr" property="imgListStr"/>
<!-- <collection property="errorTypeList" select="getErrorType" column="{workOrderNo=work_order_no,errList=errList}" ofType="string"/>-->
</resultMap>
@@ -35,13 +36,15 @@
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
+ 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_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_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
@@ -49,10 +52,12 @@
<if test="query.workOrderNo != null and query.workOrderNo != ''">
AND wo.work_order_no = #{query.workOrderNo}
</if>
- <if test="query.status != null">
+ <if test="query.status != null and query.status != ''">
AND wo.status = #{query.status}
</if>
- <!-- 娉ㄦ剰锛氳繖閲岀Щ闄や簡瀵筿uery.errorType鐨勭洿鎺ユ煡璇紝鍥犱负瀹冪幇鍦ㄩ�氳繃JOIN鍜孏ROUP_CONCAT澶勭悊 -->
+ <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>
@@ -215,11 +220,13 @@
<select id="hasErrorWorkOrderList" resultType="com.ycl.platform.domain.vo.DeviceInfoVO">
SELECT
wo.id as workOrderId,
- di.device_id,
- di.channel_id
+ wo.work_order_no as workOrderNo,
+ wo.serial_number as deviceId
FROM
t_work_order wo
- INNER JOIN t_device_info di ON wo.serial_number = di.device_id
+ WHERE
+ wo.create_time BETWEEN #{start} AND #{end}
+ AND deleted = 0
</select>
<insert id="addMany">
@@ -233,7 +240,7 @@
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
+ 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}
</select>
@@ -247,4 +254,33 @@
WHERE id = #{item.id}
</foreach>
</update>
+
+
+ <select id="getNotFinishedWorkOrders" resultMap="GenWorkOrderMap">
+ SELECT
+ DISTINCT
+ wo.id,
+ wo.serial_number,
+ wo.status,
+ wo.work_order_no,
+ GROUP_CONCAT(DISTINCT et.error_name SEPARATOR ',') AS error_names
+ FROM
+ t_work_order wo
+ LEFT JOIN t_work_order_error_type et ON et.work_order_no = wo.work_order_no
+ WHERE
+ wo.status != 'AUDITING_SUCCESS'
+ AND wo.deleted = 0
+ AND wo.serial_number in <foreach collection="list" open="(" separator="," close=")" item="serialNumber">
+ #{serialNumber}
+ </foreach>
+ GROUP BY
+ wo.id, wo.serial_number, wo.status, wo.work_order_no
+ </select>
+
+ <resultMap id="GenWorkOrderMap" type="com.ycl.platform.domain.entity.WorkOrder">
+ <id column="id" property="id"/>
+ <result column="serial_number" property="serialNumber"/>
+ <result column="status" property="status" typeHandler="com.baomidou.mybatisplus.core.handlers.MybatisEnumTypeHandler"/>
+ <result column="error_names" property="errorType"/>
+ </resultMap>
</mapper>
--
Gitblit v1.8.0