From e1d21fa4328aa38fc37404efa8ce6f7231bc1c36 Mon Sep 17 00:00:00 2001
From: "Mr. Lan" <fdevops@163.com>
Date: Sun, 14 Mar 2021 01:10:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=8E=92=E5=90=8D=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/dashboard/dashboard.go | 18 ++++++++++++++-
 pkg/service/dashboard.go    | 44 ++++++++++++++++++++++++++++++++++---
 2 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/apis/dashboard/dashboard.go b/apis/dashboard/dashboard.go
index ffa6318..206aa39 100644
--- a/apis/dashboard/dashboard.go
+++ b/apis/dashboard/dashboard.go
@@ -21,6 +21,8 @@ func InitData(c *gin.Context) {
 		submit    map[string][]interface{}
 		startTime string
 		endTime   string
+		handle    interface{}
+		period    interface{}
 	)
 
 	startTime = c.DefaultQuery("start_time", "")
@@ -58,11 +60,25 @@ func InitData(c *gin.Context) {
 		return
 	}
 
-	// 工单处理人统计
+	// 处理工单人员排行榜
+	handle, err = statistics.HandlePersonRank()
+	if err != nil {
+		app.Error(c, -1, err, "查询处理工单人员排行失败")
+		return
+	}
+
+	// 工单处理耗时排行榜
+	period, err = statistics.HandlePeriodRank()
+	if err != nil {
+		app.Error(c, -1, err, "查询工单处理耗时排行失败")
+		return
+	}
 
 	app.OK(c, map[string]interface{}{
 		"count":  count,
 		"ranks":  ranks,
 		"submit": submit,
+		"handle": handle,
+		"period": period,
 	}, "")
 }
diff --git a/pkg/service/dashboard.go b/pkg/service/dashboard.go
index 5b684b1..a1e5143 100644
--- a/pkg/service/dashboard.go
+++ b/pkg/service/dashboard.go
@@ -200,8 +200,6 @@ func (s *Statistics) WorkOrderCount(c *gin.Context) (countList map[string]int, e
 
 // 查询指定范围内的提交工单排名数据
 func (s *Statistics) WorkOrderRanks() (ranks []Ranks, err error) {
-	ranks = make([]Ranks, 0)
-
 	err = orm.Eloquent.Model(&process.WorkOrderInfo{}).
 		Joins("left join p_process_info on p_process_info.id = p_work_order_info.process").
 		Select("p_process_info.name as name, count(p_work_order_info.id) as total").
@@ -210,6 +208,46 @@ func (s *Statistics) WorkOrderRanks() (ranks []Ranks, err error) {
 		Order("total desc").
 		Limit(10).
 		Scan(&ranks).Error
-
 	return
 }
+
+// 处理工单人员排行榜
+func (s *Statistics) HandlePersonRank() (interface{}, error) {
+	var (
+		err   error
+		ranks []struct {
+			UserID   int    `json:"user_id"`
+			Username string `json:"username"`
+			Nickname string `json:"nickname"`
+			Count    int    `json:"count"`
+		}
+	)
+	err = orm.Eloquent.Model(&process.CirculationHistory{}).
+		Joins("left join sys_user on sys_user.user_id = p_work_order_circulation_history.processor_id").
+		Where("p_work_order_circulation_history.source like 'receiveTask%' and p_work_order_circulation_history.status = 1 and p_work_order_circulation_history.create_time between ? and ?", s.StartTime, s.EndTime).
+		Select("p_work_order_circulation_history.processor_id as user_id, p_work_order_circulation_history.processor as nickname, sys_user.username as username, count(p_work_order_circulation_history.id) as count").
+		Group("p_work_order_circulation_history.processor, p_work_order_circulation_history.processor_id").
+		Scan(&ranks).Error
+	return ranks, err
+}
+
+// 工单处理耗时排行榜
+func (s *Statistics) HandlePeriodRank() (interface{}, error) {
+	var (
+		err   error
+		ranks []struct {
+			UserID       int    `json:"user_id"`
+			Username     string `json:"username"`
+			Nickname     string `json:"nickname"`
+			CostDuration int    `json:"cost_duration"`
+		}
+	)
+	err = orm.Eloquent.Model(&process.CirculationHistory{}).
+		Joins("left join sys_user on sys_user.user_id = p_work_order_circulation_history.processor_id").
+		Where("p_work_order_circulation_history.source like 'receiveTask%' and p_work_order_circulation_history.status = 1 and p_work_order_circulation_history.create_time between ? and ?", s.StartTime, s.EndTime).
+		Select("p_work_order_circulation_history.processor_id as user_id, p_work_order_circulation_history.processor as nickname, sys_user.username as username, sum(p_work_order_circulation_history.cost_duration) as cost_duration").
+		Group("p_work_order_circulation_history.processor, p_work_order_circulation_history.processor_id").
+		Order("cost_duration desc").
+		Scan(&ranks).Error
+	return ranks, err
+}