Merge branch 'zouap' of https://git.openi.org.cn/OpenI/aiforge into zouap

models/user_business_analysis.go

@@ -90,15 +90,7 @@ type UserBusinessAnalysisList []*UserBusinessAnalysis
 func (ulist UserBusinessAnalysisList) Swap(i, j int) { ulist[i], ulist[j] = ulist[j], ulist[i] }
 func (ulist UserBusinessAnalysisList) Len() int      { return len(ulist) }
 func (ulist UserBusinessAnalysisList) Less(i, j int) bool {
-	if ulist[i].CommitCount > ulist[j].CommitCount {
-		return true
-	} else {
-		if ulist[i].CommitCount == ulist[j].CommitCount {
-			return ulist[i].ID > ulist[j].ID
-		} else {
-			return false
-		}
-	}
+	return ulist[i].ID > ulist[j].ID
 }
 
 func QueryUserStaticData(startTime int64, endTime int64) []*UserBusinessAnalysis {
@@ -201,7 +193,7 @@ func QueryUserStaticDataPage(opts *UserBusinessAnalysisQueryOptions) ([]*UserBus
 	}
 
 	userBusinessAnalysisList := make([]*UserBusinessAnalysis, 0)
-	if err := statictisSess.Table("user_business_analysis").Where(cond).OrderBy("count_date desc").
+	if err := statictisSess.Table("user_business_analysis").Where(cond).OrderBy("id desc").
 		Find(&userBusinessAnalysisList); err != nil {
 		return nil, 0
 	}

routers/repo/user_data_analysis.go

@@ -129,8 +129,12 @@ func QueryUserStaticDataPage(ctx *context.Context) {
 			xlsx.SetCellValue(sheetName, "M"+rows, userRecord.EncyclopediasCount)
 			xlsx.SetCellValue(sheetName, "N"+rows, userRecord.CreateRepoCount)
 			xlsx.SetCellValue(sheetName, "O"+rows, fmt.Sprintf("%.2f", userRecord.OpenIIndex))
-			xlsx.SetCellValue(sheetName, "P"+rows, userRecord.RegistDate.Format("2006-01-02"))
-			xlsx.SetCellValue(sheetName, "Q"+rows, time.Unix(userRecord.CountDate, 0).Format("2006-01-02"))
+
+			formatTime := userRecord.RegistDate.Format("2006-01-02 15:04:05")
+			xlsx.SetCellValue(sheetName, "P"+rows, formatTime[0:len(formatTime)-3])
+
+			formatTime = time.Unix(userRecord.CountDate, 0).Format("2006-01-02 15:04:05")
+			xlsx.SetCellValue(sheetName, "Q"+rows, formatTime[0:len(formatTime)-3])
 		}
 
 		//设置默认打开的表单