From b91945ea32378a71d1e57356af6e16703a1ceaa7 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 01 十一月 2024 14:52:16 +0800
Subject: [PATCH] 工单只下发考核的、阈值bug
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 78 +++++++++++++++++++++++++++++++++++----
1 files changed, 70 insertions(+), 8 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index b650439..859b1a5 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -8,6 +8,9 @@
<result column="create_time" property="createTime"/>
<result column="work_order_no" property="workOrderNo"/>
<result column="unit_id" property="unitId"/>
+ <result column="unit_name" property="unitName"/>
+ <result column="unit_contact" property="unitContact"/>
+ <result column="unit_contact_phone" property="unitContactPhone"/>
<result column="yw_people_id" property="ywPeopleId"/>
<result column="yw_handle_time" property="ywHandleTime"/>
<result column="yw_result" property="ywResult"/>
@@ -31,6 +34,64 @@
</select>
<select id="page" resultMap="BaseResultMap">
+ SELECT
+ wo.id,wo.status,
+ wo.work_order_no,
+ wo.serial_number,
+ 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,
+ u.unit_contact,
+ u.unit_contact_phone,
+ 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 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 t_yw_unit u ON wo.unit_id = u.id AND u.deleted = 0
+ INNER JOIN sys_dict_data da ON da.dict_value = et.error_name AND da.dict_type = 'error_type'
+ LEFT JOIN t_work_order_check_img ci ON ci.work_order_no = wo.work_order_no
+ LEFT JOIN t_yw_people p ON wo.yw_people_id = p.id AND p.deleted = 0
+ WHERE
+ wo.deleted = 0 and wo.status != 'WAIT_DISTRIBUTE'
+ <if test="query.unitId != null">
+ AND wo.unit_id = #{query.unitId}
+ </if>
+ <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 in
+ <foreach collection="query.errorTypeList" open="(" separator="," close=")" item="errorType">#{errorType}</foreach>
+ ))
+ </if>
+ <if test="query.keyword != null and query.keyword != ''">
+ AND (wo.work_order_no like concat('%', #{query.keyword}, '%') or tm.name like concat('%', #{query.keyword}, '%') or wo.serial_number like concat('%', #{query.keyword}, '%'))
+ </if>
+ <if test="query.status != null and query.status != ''">
+ AND wo.status = #{query.status}
+ </if>
+ <if test="query.start != null and query.end != null">
+ AND wo.create_time BETWEEN #{query.start} AND #{query.end}
+ </if>
+ GROUP BY
+ wo.id, wo.status, wo.work_order_no, wo.serial_number,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.work_order_no DESC
+ </select>
+
+ <select id="export" resultMap="BaseResultMap">
SELECT
wo.id,wo.status,
wo.work_order_no,
@@ -68,14 +129,14 @@
<if test="query.status != null and query.status != ''">
AND wo.status = #{query.status}
</if>
- <if test="query.start != null">
- AND wo.yw_handle_time BETWEEN #{query.start} AND #{query.end}
+ <if test="query.start != null and query.end != null">
+ AND wo.create_time BETWEEN #{query.start} AND #{query.end}
</if>
GROUP BY
wo.id, wo.status, wo.work_order_no, wo.serial_number,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
+ ORDER BY wo.work_order_no DESC
</select>
<select id="distributePage" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
@@ -83,6 +144,7 @@
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.serial_number,
yp.province_tag,
yp.important_tag,
yp.important_command_image_tag,
@@ -209,7 +271,7 @@
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 == 3"> AND p.important_tag = 1 </if>
+ <if test="dataScope == 3"> AND p.dept_tag = 1 </if>
<if test="deptId != null"> AND p.dept_id = #{deptId} </if>
</select>
@@ -224,10 +286,10 @@
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 == 3"> AND p.important_tag = 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
- ORDER BY d.dept_id
+ ORDER BY d.area_code
</select>
<select id="hasErrorWorkOrderList" resultType="com.ycl.platform.domain.vo.DeviceInfoVO">
@@ -238,8 +300,8 @@
FROM
t_work_order wo
WHERE
- wo.create_time BETWEEN #{start} AND #{end} AND wo.status = 'AUDITING'
- AND deleted = 0
+ wo.status = 'YW_HANDLE'
+ AND wo.deleted = 0
</select>
<insert id="addMany">
--
Gitblit v1.8.0