Merge branch 'feature/v4.8.83' into dev/v4.8.83_rjj

src/jfw/front/nzjProject.go

@@ -374,7 +374,7 @@ func NewHotEnt(isWinner bool) (data []map[string]interface{}) {
 	if len(redisArr) > 0 {
 		dataArr := common.ObjArrToMapArr(redisArr)
 		if len(dataArr) > 10 {
-			randomNumber := rand.Intn(len(data) - 10)
+			randomNumber := rand.Intn(len(dataArr) - 10)
 			data = dataArr[randomNumber : randomNumber+10]
 		} else {
 			data = dataArr
@@ -533,29 +533,31 @@ func HotIndustryAndRegion(ind string) (dataArr []map[string]interface{}) {
 			data := make(map[string]interface{})
 			data["area"] = bucket.Key
 			var yearArr []map[string]interface{}
-			if bucket.LastYearsCount.DocCount > 0 {
-				year1 := map[string]interface{}{
-					"year":  tm.AddDate(-1, 0, 0).Year(),
-					"count": bucket.LastYearsCount.DocCount,
-				}
-				yearArr = append(yearArr, year1)
+			year3 := map[string]interface{}{ //3年前
+				"year":  tm.AddDate(-3, 0, 0).Year(),
+				"count": bucket.LastThreeYearsCount.DocCount,
 			}
+			yearArr = append(yearArr, year3)
 
-			year2 := map[string]interface{}{
+			year2 := map[string]interface{}{ //2年前
 				"year":  tm.AddDate(-2, 0, 0).Year(),
-				"count": bucket.LastOneYearCount.DocCount,
+				"count": bucket.LastTwoYearsCount.DocCount,
 			}
 			yearArr = append(yearArr, year2)
-			year3 := map[string]interface{}{
-				"year":  tm.AddDate(-3, 0, 0).Year(),
-				"count": bucket.LastTwoYearsCount.DocCount,
+
+			year1 := map[string]interface{}{ //1年前
+				"year":  tm.AddDate(-1, 0, 0).Year(),
+				"count": bucket.LastOneYearCount.DocCount,
 			}
-			yearArr = append(yearArr, year3)
-			year4 := map[string]interface{}{
-				"year":  tm.AddDate(-4, 0, 0).Year(),
-				"count": bucket.LastThreeYearsCount.DocCount,
+			yearArr = append(yearArr, year1)
+
+			if bucket.LastYearsCount.DocCount > 0 { //今年
+				year := map[string]interface{}{
+					"year":  tm.Year(),
+					"count": bucket.LastYearsCount.DocCount,
+				}
+				yearArr = append(yearArr, year)
 			}
-			yearArr = append(yearArr, year4)
 			data["yearArr"] = yearArr
 			dataArr = append(dataArr, data)
 		}