From 99b53c056b309b935c8eb23a0ddf244bd4f4df96 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期日, 01 九月 2024 21:54:32 +0800
Subject: [PATCH] 报备功能优化
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 2dba5e9..a487fd4 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -240,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>
@@ -254,4 +254,32 @@
WHERE id = #{item.id}
</foreach>
</update>
+
+
+ <select id="getNotFinishedWorkOrders" resultMap="GenWorkOrderMap">
+ SELECT
+ 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