From 168346cebced28d8bcf39e5817c7367e9976424c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 02 八月 2024 17:30:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml | 112 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 96 insertions(+), 16 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
index 364b380..59c1e98 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/WorkOrderMapper.xml
@@ -13,6 +13,7 @@
<result column="yw_result" property="ywResult"/>
<result column="yw_condition" property="ywCondition"/>
<result column="yw_check_result" property="ywCheckResult"/>
+ <result column="overtime" property="overtime"/>
</resultMap>
<select id="page" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
@@ -22,17 +23,17 @@
p.yw_person_name
FROM
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'
+ 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
where
- wo.deleted = '0'
+ wo.deleted = 0
<if test="query.workOrderNo != null and query.workOrderNo != ''">
AND wo.work_order_no = #{query.workOrderNo}
</if>
<if test="query.status != null">
AND wo.status = #{query.status}
</if>
- <if test="query.errorType != null and query.errType != ''">
+ <if test="query.errorType != null and query.errorType != ''">
AND wo.error_type = #{query.errorType}
</if>
<if test="query.start != null">
@@ -43,20 +44,99 @@
<select id="distributePage" resultType="com.ycl.platform.domain.vo.WorkOrderVO">
SELECT
- wo.*,
- u.unit_name,
- p.yw_person_name
+ wo.*,
+ u.unit_name,
+ p.yw_person_name,
+ yp.point_tag,
+ odr.create_time as distributeTime,
+ su.nick_name as realName
FROM
- 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'
- where
- wo.deleted = '0'
- and wo.status = 'WAIT_DISTRIBUTE'
- <if test="query.unitId != null">
- AND wo.unit_id = #{query.unitId}
- </if>
+ 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
+ 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
+ wo.deleted = 0
+ <if test="query.unitId != null">
+ AND wo.unit_id = #{query.unitId}
+ </if>
+ <if test="query.status != null and query.status != ''">
+ AND wo.status = #{query.status}
+ </if>
ORDER BY wo.create_time DESC
</select>
+ <select id="handlingWorkOrderList" resultType="com.ycl.platform.domain.vo.YwPointJobVO">
+ SELECT
+ wo.id,
+ wod.create_time,
+ 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_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