From 1ad1bdc46ee343bfa5bf663f600796aed1014982 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 28 八月 2024 10:33:53 +0800
Subject: [PATCH] 海康取OSD
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index c51e86a..87b67e7 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -15,6 +15,8 @@
<result column="overtime" property="overtime"/>
<result column="deduct" property="deduct"/>
<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>
@@ -29,12 +31,14 @@
<select id="page" resultMap="BaseResultMap">
SELECT
- wo.id,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.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
+ INNER JOIN t_monitor tm ON wo.serial_number = tm.serial_number
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_work_order_error_type et ON wo.work_order_no = et.work_order_no
@@ -53,7 +57,7 @@
AND wo.yw_handle_time BETWEEN #{query.start} AND #{query.end}
</if>
GROUP BY
- wo.id,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.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
@@ -168,7 +172,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>
@@ -182,7 +187,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
@@ -205,4 +211,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