数据统计

models/statistics/dashboard.go

@@ -75,6 +75,7 @@ func (m *StatisticsDAO) GetUsedCourseOrderCustomer(orgID string, caseIDs []strin
 
 // GetOrderGoodsNumber 获取商品下单数量
 func (m *StatisticsDAO) GetOrderGoodsNumber(orgID string, caseIDs []string, start, end *time.Time) (int64, error) {
+
 	return m.execMySQLFunc("fun_order_goods_num", orgID, caseIDs, start, end)
 }
 
@@ -388,7 +389,7 @@ func (m *StatisticsDAO) GetArrivedDaily(orgID string, caseIDs []string, staType
 // execMySQLFunc 执行 mysql 函数
 func (m *StatisticsDAO) execMySQLFunc(funName, orgID string, caseIDs []string, start, end *time.Time) (int64, error) {
 	csids := ""
-	if caseIDs == nil && len(caseIDs) == 0 {
+	if caseIDs != nil && len(caseIDs) > 0 {
 		csids = strings.Join(caseIDs, ",")
 	}
 

models/statistics/goods.go

@@ -108,20 +108,21 @@ func (m *StatisticsDAO) GetGoodsStatisticsCount(caseids, typeid, name string) ([
 
 // GoodsOrdersStatistics 商品订单统计信息
 type GoodsOrdersStatistics struct {
-	OrdersId     string
-	OrdersNo     string
-	CaseName     string
-	UserType     string
-	CreateDate   time.Time
-	Status       int
-	MakeStatus   string
-	AreaName     string
-	TableNo      string
-	CustomerName string
-	Phone        string
-	Name         string
-	Remark       string
-	Details      []model.TaGoodsOrdersDetail
+	OrdersId      string
+	OrdersNo      string
+	CaseName      string
+	UserType      string
+	CreateDate    time.Time
+	Status        int
+	MakeStatus    string
+	AreaName      string
+	TableNo       string
+	CustomerName  string
+	Phone         string
+	Name          string
+	Remark        string
+	AreaIconWhite string
+	Details       []model.TaGoodsOrdersDetail
 }
 
 // GetGoodsOrderStatistics 获取商品订单
@@ -138,6 +139,7 @@ func (m *StatisticsDAO) GetGoodsOrderStatistics(status, usertype, caseids, begin
 						a.area_name,
 						a.table_no,
 						b.customer_name,
+						e.area_icon_white,
 						(
 							CASE
 							WHEN c.real_name IS NULL
@@ -154,6 +156,7 @@ func (m *StatisticsDAO) GetGoodsOrderStatistics(status, usertype, caseids, begin
 					INNER JOIN ta_customer b ON a.user_id = b.customer_id
 					INNER JOIN sys_case d ON a.case_id = d.case_id
 					LEFT JOIN sys_user c ON b.user_id = c.user_id
+					LEFT JOIN sys_case_area e ON a.area_id =e.area_id
 					where d.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')`
 
 	if usertype != "" {

service/statistics/dashboard.go

@@ -11,6 +11,7 @@ import (
 func (s *StatisticsServ) StaDashboard(caseIDs []string) ([][]interface{}, error) {
 	// 人员及类型
 	user := s.ctx.Get("user").(model.SysUser)
+
 	userTypes, err := s.dao.GetUserTypes(user.UserId)
 	if err != nil {
 		utils.LogError("获取用户类型失败: " + err.Error())