提交代码

routers/api/v1/repo/repo_dashbord.go

@@ -426,7 +426,8 @@ func GetProjectsSummaryDataFile(ctx *context.Context) {
 
 	var total int64
 	queryType := ctx.QueryTrim("type")
-	row := 2
+
+	var datas = make([]*ProjectSummaryBaseData, 0)
 
 	if queryType == "all" || queryType == "current_year" {
 		dates := getEndOfMonthDates(beginTime, endTime)
@@ -448,10 +449,8 @@ func GetProjectsSummaryDataFile(ctx *context.Context) {
 					createTime, _ := time.Parse(DATE_FORMAT, v.Date)
 					data.CreatTime = createTime.Format(MONTH_FORMAT)
 
-					for k, v := range allProjectsPeriodSummaryValues(row, &data, ctx) {
-						f.SetCellValue(projectAnalysis, k, v)
-					}
-					row++
+					datas = append(datas, &data)
+
 				}
 
 			}
@@ -475,17 +474,22 @@ func GetProjectsSummaryDataFile(ctx *context.Context) {
 					data := ProjectSummaryBaseData{}
 					setStatisticsData(&data, v, stats[j-1])
 					data.CreatTime = v.Date
+					datas = append(datas, &data)
 
-					for k, v := range allProjectsPeriodSummaryValues(row, &data, ctx) {
-						f.SetCellValue(projectAnalysis, k, v)
-					}
-					row++
 				}
 
 			}
 
 		}
 	}
+	row := 2
+	datas = reverse(datas)
+	for _, data := range datas {
+		for k, v := range allProjectsPeriodSummaryValues(row, data, ctx) {
+			f.SetCellValue(projectAnalysis, k, v)
+		}
+		row++
+	}
 
 	f.SetActiveSheet(index)