Merge branch 'bug_3711' into debug

controllers/target.go

@@ -3511,7 +3511,7 @@ func (this *TargetController) ExcelDataAdd() {
 			if i > 4 {
 				for index := 1; index < len(req.Data[i]); index++ {
 					if req.Data[i][index] == nil {
-						break
+						continue
 					}
 					valueMap := req.Data[i][index].(map[string]interface{})
 					value, _ := valueMap["m"]

services/data/jiayue_index.go

@@ -78,14 +78,21 @@ func (brg *EdbBridgeJiaYue) GetIndex(req GetIndexFromBridgeReq) (item BridgeInde
 // TransFrequency 嘉悦指标频度转换
 func (brg *EdbBridgeJiaYue) TransFrequency(origin string) string {
 	mapping := map[string]string{
-		"日":  "日度",
-		"周":  "周度",
-		"旬":  "旬度",
-		"半月": "旬度",
-		"月":  "月度",
-		"季":  "季度",
-		"半年": "半年度",
-		"年":  "年度",
+		"日":   "日度",
+		"周":   "周度",
+		"旬":   "旬度",
+		"半月":  "旬度",
+		"月":   "月度",
+		"季":   "季度",
+		"半年":  "半年度",
+		"年":   "年度",
+		"日度":  "日度",
+		"周度":  "周度",
+		"旬度":  "旬度",
+		"月度":  "月度",
+		"季度":  "季度",
+		"半年度": "半年度",
+		"年度":  "年度",
 	}
 	return mapping[origin]
 }