Merge pull request '导出报告拥有者单独一列' (#861) from fix-828 into V20211115

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/861
Reviewed-by: lewis <747342561@qq.com>

routers/api/v1/repo/repo_dashbord.go

@@ -178,6 +178,7 @@ func ServeAllProjectsPeriodStatisticsFile(ctx *context.Context) {
 	f := excelize.NewFile()
 
 	index := f.NewSheet(projectAnalysis)
+	f.DeleteSheet("Sheet1")
 
 	for k, v := range allProjectsPeroidHeader(ctx) {
 		f.SetCellValue(projectAnalysis, k, v)
@@ -198,7 +199,6 @@ func ServeAllProjectsPeriodStatisticsFile(ctx *context.Context) {
 
 	}
 	f.SetActiveSheet(index)
-	f.DeleteSheet("Sheet1")
 
 	ctx.Resp.Header().Set("Content-Disposition", "attachment; filename="+url.QueryEscape(fileName))
 	ctx.Resp.Header().Set("Content-Type", "application/octet-stream")
@@ -224,16 +224,16 @@ func getFileName(ctx *context.Context, beginTime time.Time, endTime time.Time, p
 
 func allProjectsPeroidHeader(ctx *context.Context) map[string]string {
 
-	return map[string]string{"A1": ctx.Tr("admin.repos.id"), "B1": ctx.Tr("admin.repos.projectName"), "C1": ctx.Tr("admin.repos.isPrivate"), "D1": ctx.Tr("admin.repos.openi"), "E1": ctx.Tr("admin.repos.visit"), "F1": ctx.Tr("admin.repos.download"), "G1": ctx.Tr("admin.repos.pr"), "H1": ctx.Tr("admin.repos.commit"),
-		"I1": ctx.Tr("admin.repos.watches"), "J1": ctx.Tr("admin.repos.stars"), "K1": ctx.Tr("admin.repos.forks"), "L1": ctx.Tr("admin.repos.issues"), "M1": ctx.Tr("admin.repos.closedIssues"), "N1": ctx.Tr("admin.repos.contributor")}
+	return map[string]string{"A1": ctx.Tr("admin.repos.id"), "B1": ctx.Tr("admin.repos.projectName"), "C1": ctx.Tr("repo.owner"), "D1": ctx.Tr("admin.repos.isPrivate"), "E1": ctx.Tr("admin.repos.openi"), "F1": ctx.Tr("admin.repos.visit"), "G1": ctx.Tr("admin.repos.download"), "H1": ctx.Tr("admin.repos.pr"), "I1": ctx.Tr("admin.repos.commit"),
+		"J1": ctx.Tr("admin.repos.watches"), "K1": ctx.Tr("admin.repos.stars"), "L1": ctx.Tr("admin.repos.forks"), "M1": ctx.Tr("admin.repos.issues"), "N1": ctx.Tr("admin.repos.closedIssues"), "O1": ctx.Tr("admin.repos.contributor")}
 
 }
 
 func allProjectsPeroidValues(row int, rs *models.RepoStatistic, ctx *context.Context) map[string]string {
-	return map[string]string{getCellName("A", row): strconv.FormatInt(rs.RepoID, 10), getCellName("B", row): constructDistinctName(rs), getCellName("C", row): getIsPrivateDisplay(rs.IsPrivate, ctx), getCellName("D", row): strconv.FormatFloat(rs.RadarTotal, 'f', 2, 64),
-		getCellName("E", row): strconv.FormatInt(rs.NumVisits, 10), getCellName("F", row): strconv.FormatInt(rs.NumDownloads, 10), getCellName("G", row): strconv.FormatInt(rs.NumPulls, 10), getCellName("H", row): strconv.FormatInt(rs.NumCommits, 10),
-		getCellName("I", row): strconv.FormatInt(rs.NumWatches, 10), getCellName("J", row): strconv.FormatInt(rs.NumStars, 10), getCellName("K", row): strconv.FormatInt(rs.NumForks, 10), getCellName("L", row): strconv.FormatInt(rs.NumIssues, 10),
-		getCellName("M", row): strconv.FormatInt(rs.NumClosedIssues, 10), getCellName("N", row): strconv.FormatInt(rs.NumContributor, 10),
+	return map[string]string{getCellName("A", row): strconv.FormatInt(rs.RepoID, 10), getCellName("B", row): rs.Name, getCellName("C", row): rs.OwnerName, getCellName("D", row): getIsPrivateDisplay(rs.IsPrivate, ctx), getCellName("E", row): strconv.FormatFloat(rs.RadarTotal, 'f', 2, 64),
+		getCellName("F", row): strconv.FormatInt(rs.NumVisits, 10), getCellName("G", row): strconv.FormatInt(rs.NumDownloads, 10), getCellName("H", row): strconv.FormatInt(rs.NumPulls, 10), getCellName("I", row): strconv.FormatInt(rs.NumCommits, 10),
+		getCellName("J", row): strconv.FormatInt(rs.NumWatches, 10), getCellName("K", row): strconv.FormatInt(rs.NumStars, 10), getCellName("L", row): strconv.FormatInt(rs.NumForks, 10), getCellName("M", row): strconv.FormatInt(rs.NumIssues, 10),
+		getCellName("N", row): strconv.FormatInt(rs.NumClosedIssues, 10), getCellName("O", row): strconv.FormatInt(rs.NumContributor, 10),
 	}
 }
 
@@ -241,13 +241,6 @@ func getCellName(col string, row int) string {
 	return col + strconv.Itoa(row)
 }
 
-func constructDistinctName(rs *models.RepoStatistic) string {
-	if rs.OwnerName == "" {
-		return rs.Name
-	}
-	return rs.OwnerName + "/" + rs.Name
-}
-
 func getIsPrivateDisplay(private bool, ctx *context.Context) string {
 	if private {
 		return ctx.Tr("admin.repos.yes")