From 8e49eae6b1c33e0a02742af2657a1f2c0b89d95b Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 06 八月 2024 17:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 62 ++++++++++++++++++++++++++++++-
1 files changed, 60 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 1fe79c6..fa34221 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,10 +75,68 @@
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
</select>
+ <select id="screenWorkOrder" resultType="com.ycl.platform.domain.vo.screen.ScreenWorkOrderVO">
+ SELECT
+ count(*) AS total,
+ SUM(CASE WHEN status = 'AUDITING_SUCCESS' THEN 1 ELSE 0 END) AS totalHandler,
+ SUM(CASE WHEN status = 'DISTRIBUTED' THEN 1 ELSE 0 END) AS totalNotFinish
+ FROM
+ t_work_order
+ </select>
+
+ <select id="home" resultType="java.util.Map">
+ <if test="dateType == 'month'">
+ -- 鏈堝伐鍗曟暟
+ SELECT
+ u.unit_name AS name,
+ CONCAT(MONTH(w.create_time), '鏈�') AS dateType,
+ COUNT(IF(status = 'AUDITING_SUCCESS', 1, NULL)) AS num1,
+ COUNT(IF(status = 'DISTRIBUTED', 1, NULL)) AS num2,
+ COUNT(IF(status = 'YW_HANDLE', 1, NULL)) AS num3
+ FROM t_work_order w
+ LEFT JOIN t_yw_unit u ON w.unit_id = u.id
+ WHERE DATE_FORMAT(w.create_time, '%Y') = DATE_FORMAT(NOW(), '%Y')
+ AND w.deleted = 0 AND unit_id = #{unitId}
+ GROUP BY dateType
+ </if>
+
+ <if test="dateType == 'week'">
+ -- 鍛ㄥ伐鍗曟暟
+ SELECT
+ u.unit_name AS name,
+ CONCAT('鍛�', WEEKDAY(w.create_time)) AS dateType,
+ COUNT(IF(status = 'AUDITING_SUCCESS', 1, NULL)) AS num1,
+ COUNT(IF(status = 'DISTRIBUTED', 1, NULL)) AS num2,
+ COUNT(IF(status = 'YW_HANDLE', 1, NULL)) AS num3
+ FROM t_work_order w
+ LEFT JOIN t_yw_unit u ON w.unit_id = u.id
+ WHERE
+ w.create_time BETWEEN DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) DAY) AND DATE_ADD(CURDATE(), INTERVAL (6 - WEEKDAY(CURDATE())) DAY)
+ AND w.deleted = 0 AND unit_id = #{unitId}
+ GROUP BY dateType
+ </if>
+
+ <if test="dateType == 'day'">
+ -- 鏃ュ伐鍗曟暟
+ SELECT
+ u.unit_name AS name,
+ DATE_FORMAT(w.create_time, '%d') AS dateType,
+ COUNT(IF(status = 'AUDITING_SUCCESS', 1, NULL)) AS num1,
+ COUNT(IF(status = 'DISTRIBUTED', 1, NULL)) AS num2,
+ COUNT(IF(status = 'YW_HANDLE', 1, NULL)) AS num3
+ FROM t_work_order w
+ LEFT JOIN t_yw_unit u ON w.unit_id = u.id
+ WHERE
+ DATE_FORMAT(w.create_time, '%Y-%m-%d') BETWEEN DATE_FORMAT(CURDATE(), '%Y-%m-01') AND LAST_DAY(CURDATE())
+ AND w.deleted = 0 AND unit_id = #{unitId}
+ GROUP BY dateType
+ </if>
+ </select>
+
</mapper>
--
Gitblit v1.8.0