From 4b344997d4635d23e98f7a703b4ba03994ec2515 Mon Sep 17 00:00:00 2001
From: ychao_1983 <ychao_1983@sina.com>
Date: Tue, 10 May 2022 11:25:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 routers/api/v1/repo/repo_dashbord.go | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/routers/api/v1/repo/repo_dashbord.go b/routers/api/v1/repo/repo_dashbord.go
index ca7879a18..95c0e399e 100644
--- a/routers/api/v1/repo/repo_dashbord.go
+++ b/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)