From ec674d362bf2dba85ba7fdf9c42b73ac62bf3333 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 04 九月 2024 05:23:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 69 +++++++++++++++++++++++++++-------
1 files changed, 55 insertions(+), 14 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 18827a0..4717be2 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>
@@ -31,33 +32,40 @@
<select id="page" resultMap="BaseResultMap">
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, wo.yw_check_result, wo.overtime, wo.deduct,
+ 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,
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 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' <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_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
+ <if test="query.unitId != null">
+ AND wo.unit_id = #{query.unitId}
+ </if>
<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,tm.name, wo.yw_handle_time, wo.yw_result, wo.yw_check_result, wo.overtime, wo.deduct,
+ 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
@@ -82,7 +90,7 @@
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
+ INNER 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
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
@@ -90,6 +98,9 @@
wo.deleted = 0
<if test="query.unitId != null">
AND wo.unit_id = #{query.unitId}
+ </if>
+ <if test="query.unitId == null">
+ AND wo.unit_id is not null
</if>
<if test="query.status != null and query.status != ''">
AND wo.status = #{query.status}
@@ -185,8 +196,8 @@
<select id="workOrderTotal" resultType="com.ycl.platform.domain.vo.screen.WorkOrderTotalVO">
SELECT
COUNT(*) AS totalNum,
- COUNT(IF(w.status = 'DISTRIBUTED', 1, NULL)) + COUNT(IF(w.status = 'AUDITING_FAIL', 1, NULL)) + COUNT(IF(w.status = 'WAIT_DISTRIBUTE', 1, NULL)) AS todoNum,
- COUNT(IF(w.status = 'YW_HANDLE', 1, NULL)) + COUNT(IF(w.status = 'AUDITING_SUCCESS', 1, NULL)) + COUNT(IF(w.status = 'AUDITING', 1, NULL)) AS doneNum
+ COUNT(IF(w.status != 'AUDITING_SUCCESS' and w.status != 'WAIT_DISTRIBUTED', 1, NULL)) AS todoNum,
+ COUNT(IF(w.status = 'AUDITING_SUCCESS', 1, NULL)) AS doneNum
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
@@ -215,12 +226,13 @@
<select id="hasErrorWorkOrderList" resultType="com.ycl.platform.domain.vo.DeviceInfoVO">
SELECT
wo.id as workOrderId,
- we.device_id,
- wec.channel_id
+ wo.work_order_no as workOrderNo,
+ wo.serial_number as deviceId
FROM
t_work_order wo
- INNER JOIN wvp2.wvp_device we ON we.device_id = wo.serial_number
- INNER JOIN wvp2.wvp_device_channel wec ON we.device_id = wec.device_id
+ WHERE
+ wo.create_time BETWEEN #{start} AND #{end}
+ AND deleted = 0
</select>
<insert id="addMany">
@@ -234,7 +246,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>
@@ -248,4 +260,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