From 45d5b8bdbe5407b88cc324fdbcbcbaa51b7ab64c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 07 八月 2024 16:36:49 +0800
Subject: [PATCH] 点位时间优化
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 59c1e98..f07833f 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -54,7 +54,7 @@
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_yw_point yp ON yp.id = wo.point_id AND yp.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_id = wo.id AND odr.deleted = 0
LEFT JOIN sys_user su ON su.user_id = odr.user_id
WHERE
@@ -75,7 +75,7 @@
yp.point_tag
FROM
t_work_order wo
- INNER JOIN t_yw_point yp ON yp.id = wo.point_id AND yp.deleted = 0
+ INNER JOIN t_yw_point yp ON yp.serial_number = wo.serial_number AND yp.deleted = 0
INNER JOIN t_work_order_distribute_record wod ON wod.work_order_id = wo.id
WHERE
wo.status = 'DISTRIBUTED' AND wo.deleted = 0
@@ -139,4 +139,17 @@
</if>
</select>
+ <select id="workOrderTotal" resultType="java.util.Map">
+ SELECT
+ COUNT(*) AS totalNum,
+ COUNT(IF(status = 'DISTRIBUTED', 1, NULL)) + COUNT(IF(status = 'AUDITING_FAIL', 1, NULL)) + COUNT(IF(status = 'WAIT_DISTRIBUTE', 1, NULL)) AS todoNum,
+ COUNT(IF(status = 'YW_HANDLE', 1, NULL)) + COUNT(IF(status = 'AUDITING_SUCCESS', 1, NULL)) + COUNT(IF(status = 'AUDITING', 1, NULL)) AS doneNum
+ FROM t_work_order w
+ WHERE w.deleted = 0
+ </select>
+
+ <select id="workOrderRegion" resultType="java.util.Map">
+ SELECT * FROM t_work_order limit 1
+ </select>
+
</mapper>
--
Gitblit v1.8.0