From 5fa180af29fb744d0f8a7ecdb99a807ca5278d03 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 30 八月 2024 12:15:52 +0800
Subject: [PATCH] 待查询图片的工单查询bug
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 70 +++++++++++++++++++++++++++-------
1 files changed, 55 insertions(+), 15 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 2bce97b..2dba5e9 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -16,6 +16,8 @@
<result column="deduct" property="deduct"/>
<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>
@@ -33,28 +35,34 @@
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,
- GROUP_CONCAT(DISTINCT da.dict_label ORDER BY da.dict_label SEPARATOR ',') AS errorType
+ tm.name as source,
+ 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
- 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_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
wo.deleted = 0
<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>
GROUP BY
- 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.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
@@ -62,19 +70,25 @@
<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_no = wo.work_order_no AND odr.deleted = 0
LEFT JOIN sys_user su ON su.user_id = odr.user_id
WHERE
@@ -85,6 +99,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>
@@ -169,7 +195,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>
@@ -183,7 +210,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
@@ -192,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">
@@ -214,4 +244,14 @@
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