update

app/admin/svc/svc_data_statisstics.go

@@ -721,11 +721,15 @@ func SelfSupportForSchoolDataStatisticsExport(req md.SelfSupportForSchoolDataSta
 			xlsx.SetColWidth("所有档口", "A", "C", 20)
 			j := 3 //表头前两行用了，只能从第三行开始
 			var totalNum, totalAmount float64
-			for key, val := range totalData {
-				totalNum += val["num"]
-				totalAmount += val["amount"]
-				xlsx.SetSheetRow("所有档口", "A"+strconv.Itoa(j), &[]interface{}{key, val["num"], val["amount"]})
-				j++
+			for _, device := range deviceList {
+				for key, val := range totalData {
+					if key == device.Name {
+						totalNum += val["num"]
+						totalAmount += val["amount"]
+						xlsx.SetSheetRow("所有档口", "A"+strconv.Itoa(j), &[]interface{}{key, val["num"], val["amount"]})
+						j++
+					}
+				}
 			}
 			xlsx.SetSheetRow("所有档口", "A"+strconv.Itoa(j), &[]interface{}{"合计", totalNum, totalAmount})