From cf83fd62bb3e260307d491b43785b458e2afc2e9 Mon Sep 17 00:00:00 2001 From: DengBiao <2319963317@qq.com> Date: Thu, 14 Sep 2023 16:20:17 +0800 Subject: [PATCH] update --- app/admin/md/md_self_support.go | 8 ++++---- app/admin/svc/svc_data_statisstics.go | 18 +++++++++++------- ...学校(商家分餐数据统计表).xlsx | Bin 9181 -> 9182 bytes .../自营学校(教师消费统计表).xlsx | Bin 9037 -> 9040 bytes 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/app/admin/md/md_self_support.go b/app/admin/md/md_self_support.go index f280982..ca3f4c7 100644 --- a/app/admin/md/md_self_support.go +++ b/app/admin/md/md_self_support.go @@ -2,8 +2,8 @@ package md var SelfSupportForMealTimeMapping = []map[string]string{ { - "from": "5:30", - "to": "9.00", + "from": "05:30", + "to": "09:00", "name": "早餐", }, { @@ -13,12 +13,12 @@ var SelfSupportForMealTimeMapping = []map[string]string{ }, { "from": "17:30", - "to": "20：00", + "to": "20:00", "name": "晚餐", }, { "from": "20:30", - "to": "21：00", + "to": "21:00", "name": "夜宵", }, } diff --git a/app/admin/svc/svc_data_statisstics.go b/app/admin/svc/svc_data_statisstics.go index 7740a81..9276119 100644 --- a/app/admin/svc/svc_data_statisstics.go +++ b/app/admin/svc/svc_data_statisstics.go @@ -316,9 +316,9 @@ func SelfSupportForSchoolDataStatisticsExport(req md.SelfSupportForSchoolDataSta println("<<<>>>>1111Error:::", err.Error()) return } - var deviceListMapping map[string]model.Device - for _, v := range deviceListMapping { - deviceListMapping[v.DeviceSn] = v + var deviceListMapping = map[string]model.Device{} + for _, v := range deviceList { + deviceListMapping[v.DeviceSn] = *v } var m []*db.SelfSupportForSchoolOrdWithUserIdentity @@ -371,10 +371,13 @@ func SelfSupportForSchoolDataStatisticsExport(req md.SelfSupportForSchoolDataSta xlsx.SetSheetRow("", "A1", &titleList) sheetIndex := 2 //第一个表是模板表 - j := 4 //表头前三行被占用了，只能从第四行开始 for k, v := range data { + if k == "" { + k = "未知" + } xlsx.NewSheet(k) //1、新建表格 xlsx.CopySheet(1, sheetIndex) + j := 4 //表头前三行被占用了，只能从第四行开始 for kk, vv := range v { xlsx.SetSheetRow(k, "A"+strconv.Itoa(j), &[]interface{}{kk, vv["早餐"]["num"], vv["早餐"]["amount"], @@ -1323,13 +1326,14 @@ func CentralKitchenForSchoolDataStatisticsExport(req md.CentralKitchenForSchoolD } func JudgeSelfSupportForMealTime(mealDate string) (mealZh string) { - now := time.Now() mealZh = "未知" mealTime, _ := time.ParseInLocation("2006-01-02 15:04:05", mealDate, time.Local) for _, v := range md.SelfSupportForMealTimeMapping { //判断时间大小 - tmpFromTime, _ := time.ParseInLocation("2006-01-02 15:04:05", now.Format("2006-01-02")+" "+v["from"], time.Local) - tmpToTime, _ := time.ParseInLocation("2006-01-02 15:04:05", now.Format("2006-01-02")+" "+v["from"], time.Local) + tmpFromTime, _ := time.ParseInLocation("2006-01-02 15:04:05", mealTime.Format("2006-01-02")+" "+v["from"]+":00", time.Local) + tmpToTime, _ := time.ParseInLocation("2006-01-02 15:04:05", mealTime.Format("2006-01-02")+" "+v["to"]+":00", time.Local) + fmt.Println(">>>>>>>>>>>>>", mealTime.After(tmpFromTime)) + fmt.Println("<<<<<<<<<<<<<", mealTime.Before(tmpToTime)) if mealTime.After(tmpFromTime) && mealTime.Before(tmpToTime) { mealZh = v["name"] } diff --git a/static/template/自营学校(商家分餐数据统计表).xlsx b/static/template/自营学校(商家分餐数据统计表).xlsx index 0e29e2ebe68a439a809aea91d1f116b0f08db9eb..5f03acb2cd9ef766ded8a702e05a519b27b79c72 100644 GIT binary patch delta 1936 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