diff --git a/app/admin/svc/svc_data_statisstics.go b/app/admin/svc/svc_data_statisstics.go index 24af2ae..dd64dde 100644 --- a/app/admin/svc/svc_data_statisstics.go +++ b/app/admin/svc/svc_data_statisstics.go @@ -2629,13 +2629,23 @@ func CentralKitchenForSchoolDataStatisticsContrast(req md.CentralKitchenForSchoo if list[v.Enterprise.Name] == nil { list[v.Enterprise.Name] = make(map[string]map[string]map[string]string) } - if list[v.Enterprise.Name][v.Grade.Name] == nil { - list[v.Enterprise.Name][v.Grade.Name] = make(map[string]map[string]string) - } - if list[v.Enterprise.Name][v.Grade.Name][v.Class.Name] == nil { - list[v.Enterprise.Name][v.Grade.Name][v.Class.Name] = make(map[string]string) + if v.UserIdentity.Identity == enum.UserIdentityForCentralKitchenForTeacher { + if list[v.Enterprise.Name]["教职工"] == nil { + list[v.Enterprise.Name]["教职工"] = make(map[string]map[string]string) + } + if list[v.Enterprise.Name]["教职工"]["教职工"] == nil { + list[v.Enterprise.Name]["教职工"]["教职工"] = make(map[string]string) + } + list[v.Enterprise.Name]["教职工"]["教职工"][v.UserIdentity.Name] = v.User.Phone + } else { + if list[v.Enterprise.Name][v.Grade.Name] == nil { + list[v.Enterprise.Name][v.Grade.Name] = make(map[string]map[string]string) + } + if list[v.Enterprise.Name][v.Grade.Name][v.Class.Name] == nil { + list[v.Enterprise.Name][v.Grade.Name][v.Class.Name] = make(map[string]string) + } + list[v.Enterprise.Name][v.Grade.Name][v.Class.Name][v.UserIdentity.Name] = v.User.Phone } - list[v.Enterprise.Name][v.Grade.Name][v.Class.Name][v.UserIdentity.Name] = v.User.Phone } var list1 = map[string]map[string]map[string]map[string]string{} @@ -2643,13 +2653,23 @@ func CentralKitchenForSchoolDataStatisticsContrast(req md.CentralKitchenForSchoo if list1[v.Enterprise.Name] == nil { list1[v.Enterprise.Name] = make(map[string]map[string]map[string]string) } - if list1[v.Enterprise.Name][v.Grade.Name] == nil { - list1[v.Enterprise.Name][v.Grade.Name] = make(map[string]map[string]string) - } - if list1[v.Enterprise.Name][v.Grade.Name][v.Class.Name] == nil { - list1[v.Enterprise.Name][v.Grade.Name][v.Class.Name] = make(map[string]string) + if v.UserIdentity.Identity == enum.UserIdentityForCentralKitchenForTeacher { + if list1[v.Enterprise.Name]["教职工"] == nil { + list1[v.Enterprise.Name]["教职工"] = make(map[string]map[string]string) + } + if list1[v.Enterprise.Name]["教职工"]["教职工"] == nil { + list1[v.Enterprise.Name]["教职工"]["教职工"] = make(map[string]string) + } + list1[v.Enterprise.Name]["教职工"]["教职工"][v.UserIdentity.Name] = v.User.Phone + } else { + if list1[v.Enterprise.Name][v.Grade.Name] == nil { + list1[v.Enterprise.Name][v.Grade.Name] = make(map[string]map[string]string) + } + if list1[v.Enterprise.Name][v.Grade.Name][v.Class.Name] == nil { + list1[v.Enterprise.Name][v.Grade.Name][v.Class.Name] = make(map[string]string) + } + list1[v.Enterprise.Name][v.Grade.Name][v.Class.Name][v.UserIdentity.Name] = v.User.Phone } - list1[v.Enterprise.Name][v.Grade.Name][v.Class.Name][v.UserIdentity.Name] = v.User.Phone } var xlsFileName, xlsDownloadPath []string @@ -2696,7 +2716,7 @@ func CentralKitchenForSchoolDataStatisticsContrast(req md.CentralKitchenForSchoo continue } for k3, v3 := range v2 { - if class.Name != k3 { + if k3 != "教职工" && class.Name != k3 { continue } xlsx.NewSheet(k3)