From f742941ed77916bfa33d28ecaa11caad2374dfa4 Mon Sep 17 00:00:00 2001 From: DengBiao <2319963317@qq.com> Date: Mon, 30 Oct 2023 17:23:01 +0800 Subject: [PATCH] update --- app/admin/svc/svc_data_statisstics.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/admin/svc/svc_data_statisstics.go b/app/admin/svc/svc_data_statisstics.go index 0b306a2..a40ce0b 100644 --- a/app/admin/svc/svc_data_statisstics.go +++ b/app/admin/svc/svc_data_statisstics.go @@ -455,13 +455,13 @@ func SelfSupportForSchoolDataStatisticsExport(req md.SelfSupportForSchoolDataSta //整合数据 var data = map[string]map[string]map[string]map[string]float64{} - date1, err := time.ParseInLocation("2006-01-02", req.StartDate, time.Local) + date1, err := time.ParseInLocation("2006-01-02 15:04:05", req.StartDate, time.Local) if err != nil { logx.Error(err) println("<<<>>>>Error:::", err.Error()) return } - date2, err := time.ParseInLocation("2006-01-02", req.EndDate, time.Local) + date2, err := time.ParseInLocation("2006-01-02 15:04:05", req.EndDate, time.Local) if err != nil { logx.Error(err) println("<<<>>>>Error:::", err.Error()) @@ -473,13 +473,13 @@ func SelfSupportForSchoolDataStatisticsExport(req md.SelfSupportForSchoolDataSta shopName := date.Format("2006-01-02") for _, vv := range m { - tmpDate, err1 := time.ParseInLocation("2006-01-02", vv.SelfSupportForSchoolOrd.FaceTime, time.Local) + tmpDate, err1 := time.ParseInLocation("2006-01-02 15:04:05", vv.SelfSupportForSchoolOrd.FaceTime, time.Local) if err1 != nil { logx.Error(err1) println("<<<>>>>Error:::", err1.Error()) return } - + if shopName == tmpDate.Format("2006-01-02") { if data[vv.Enterprise.Name] == nil { data[vv.Enterprise.Name] = make(map[string]map[string]map[string]float64)