Merge branch 'pool/255' into debug

# Conflicts:
#	models/base_from_calculate.go

models/base_from_calculate.go

@@ -751,27 +751,29 @@ func handleDateSaveDataMap(dateList []string, realSaveDataMap, saveDataMap map[s
 			tmpEdbInfoId := edbInfo.EdbInfoId // 当前指标id
 			// 如果该日期不存在该指标数据，那么需要找寻前后日期的数据，进行填补
 			if _, ok := tmpDataMap[tmpEdbInfoId]; !ok {
-				day := 0
-				switch edbInfo.Frequency {
-				case "周度":
-					day = 7
-				case "旬度":
-					day = 15
-				case "月度":
-					day = 30
-				case "季度":
-					day = 90
-				case "年度":
-					day = 365
-				}
+				//day := 0
+				//switch edbInfo.Frequency {
+				//case "周度":
+				//	day = 7
+				//case "旬度":
+				//	day = 15
+				//case "月度":
+				//	day = 30
+				//case "季度":
+				//	day = 90
+				//case "年度":
+				//	day = 365
+				//}
+				// 需求池 255 指标运算文案修改，补数据遍历区间修改（2023-3-7 09:37:23修改）
+				day := 35
 				handleDateDataMap(realSaveDataMap, saveDataMap, date, tmpEdbInfoId, day)
 			}
 		}
 	}
 }
 
-// handleDateDataMap 处理单个日期的数据
-func handleDateDataMap(realSaveDataMap, saveDataMap map[string]map[int]float64, date string, edbInfoId, day int) {
+// handleDataMap 处理单个日期的数据
+func handleDataMap(realSaveDataMap, saveDataMap map[string]map[int]float64, date string, edbInfoId, day int) {
 	currDate, _ := time.ParseInLocation(utils.FormatDate, date, time.Local)
 
 	// 后一天