|
@@ -455,13 +455,13 @@ func SelfSupportForSchoolDataStatisticsExport(req md.SelfSupportForSchoolDataSta |
|
|
//整合数据 |
|
|
//整合数据 |
|
|
var data = map[string]map[string]map[string]map[string]float64{} |
|
|
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 { |
|
|
if err != nil { |
|
|
logx.Error(err) |
|
|
logx.Error(err) |
|
|
println("<<<<SelfSupportForSchoolDataStatisticsExport3>>>>>Error:::", err.Error()) |
|
|
println("<<<<SelfSupportForSchoolDataStatisticsExport3>>>>>Error:::", err.Error()) |
|
|
return |
|
|
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 { |
|
|
if err != nil { |
|
|
logx.Error(err) |
|
|
logx.Error(err) |
|
|
println("<<<<SelfSupportForSchoolDataStatisticsExport3>>>>>Error:::", err.Error()) |
|
|
println("<<<<SelfSupportForSchoolDataStatisticsExport3>>>>>Error:::", err.Error()) |
|
@@ -473,13 +473,13 @@ func SelfSupportForSchoolDataStatisticsExport(req md.SelfSupportForSchoolDataSta |
|
|
shopName := date.Format("2006-01-02") |
|
|
shopName := date.Format("2006-01-02") |
|
|
|
|
|
|
|
|
for _, vv := range m { |
|
|
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 { |
|
|
if err1 != nil { |
|
|
logx.Error(err1) |
|
|
logx.Error(err1) |
|
|
println("<<<<SelfSupportForSchoolDataStatisticsExport3>>>>>Error:::", err1.Error()) |
|
|
println("<<<<SelfSupportForSchoolDataStatisticsExport3>>>>>Error:::", err1.Error()) |
|
|
return |
|
|
return |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if shopName == tmpDate.Format("2006-01-02") { |
|
|
if shopName == tmpDate.Format("2006-01-02") { |
|
|
if data[vv.Enterprise.Name] == nil { |
|
|
if data[vv.Enterprise.Name] == nil { |
|
|
data[vv.Enterprise.Name] = make(map[string]map[string]map[string]float64) |
|
|
data[vv.Enterprise.Name] = make(map[string]map[string]map[string]float64) |
|
|