Merge branch 'feature/eta1.2.0_edb_calculate' into debug

models/base_from_calculate.go

@@ -757,7 +757,7 @@ func handleDateDataMapBefore(realSaveDataMap, saveDataMap map[string]map[int]flo
 	if currDate.Before(startDateT) {
 		if findDataMap, hasFindDataMap := realSaveDataMap[startDate]; hasFindDataMap { // 下一个日期有数据
 			if val, hasFindItem := findDataMap[edbInfoId]; hasFindItem {
-				utils.FileLog.Info(fmt.Sprintf("date:%s, 无值，取%s的值%.4f", date, startDate, val))
+				//utils.FileLog.Info(fmt.Sprintf("date:%s, 无值，取%s的值%.4f", date, startDate, val))
 				saveDataMap[date][edbInfoId] = val
 				return
 			}
@@ -767,7 +767,7 @@ func handleDateDataMapBefore(realSaveDataMap, saveDataMap map[string]map[int]flo
 	if currDate.After(endDateT) {
 		if findDataMap, hasFindDataMap := realSaveDataMap[endDate]; hasFindDataMap { // 下一个日期有数据
 			if val, hasFindItem := findDataMap[edbInfoId]; hasFindItem {
-				utils.FileLog.Info(fmt.Sprintf("date:%s, 无值，取%s的值%.4f", date, startDate, val))
+				//utils.FileLog.Info(fmt.Sprintf("date:%s, 无值，取%s的值%.4f", date, endDate, val))
 				saveDataMap[date][edbInfoId] = val
 				return
 			}
@@ -780,7 +780,7 @@ func handleDateDataMapBefore(realSaveDataMap, saveDataMap map[string]map[int]flo
 			preDateDayStr := preDateDay.Format(utils.FormatDate)
 			if findDataMap, hasFindDataMap := realSaveDataMap[preDateDayStr]; hasFindDataMap { // 下一个日期有数据
 				if val, hasFindItem := findDataMap[edbInfoId]; hasFindItem {
-					utils.FileLog.Info(fmt.Sprintf("date:%s, 无值，取%s的值%.4f", date, preDateDayStr, val))
+					//utils.FileLog.Info(fmt.Sprintf("date:%s, 无值，取%s的值%.4f", date, preDateDayStr, val))
 					saveDataMap[date][edbInfoId] = val
 					return
 				}
@@ -803,7 +803,7 @@ func handleDateDataMapAfter(realSaveDataMap, saveDataMap map[string]map[int]floa
 	if currDate.Before(startDateT) {
 		if findDataMap, hasFindDataMap := realSaveDataMap[startDate]; hasFindDataMap { // 下一个日期有数据
 			if val, hasFindItem := findDataMap[edbInfoId]; hasFindItem {
-				utils.FileLog.Info(fmt.Sprintf("date:%s, 无值，取%s的值%.4f", date, startDate, val))
+				//utils.FileLog.Info(fmt.Sprintf("date:%s, 无值，取%s的值%.4f", date, startDate, val))
 				saveDataMap[date][edbInfoId] = val
 				return
 			}
@@ -813,7 +813,7 @@ func handleDateDataMapAfter(realSaveDataMap, saveDataMap map[string]map[int]floa
 	if currDate.After(endDateT) {
 		if findDataMap, hasFindDataMap := realSaveDataMap[endDate]; hasFindDataMap { // 下一个日期有数据
 			if val, hasFindItem := findDataMap[edbInfoId]; hasFindItem {
-				utils.FileLog.Info(fmt.Sprintf("date:%s, 无值，取%s的值%.4f", date, startDate, val))
+				//utils.FileLog.Info(fmt.Sprintf("date:%s, 无值，取%s的值%.4f", date, endDate, val))
 				saveDataMap[date][edbInfoId] = val
 				return
 			}
@@ -827,7 +827,7 @@ func handleDateDataMapAfter(realSaveDataMap, saveDataMap map[string]map[int]floa
 			nextDateDayStr := nextDateDay.Format(utils.FormatDate)
 			if findDataMap, hasFindDataMap := realSaveDataMap[nextDateDayStr]; hasFindDataMap { // 下一个日期有数据
 				if val, hasFindItem := findDataMap[edbInfoId]; hasFindItem {
-					utils.FileLog.Info(fmt.Sprintf("date:%s, 无值，取%s的值%.4f", date, nextDateDayStr, val))
+					//utils.FileLog.Info(fmt.Sprintf("date:%s, 无值，取%s的值%.4f", date, nextDateDayStr, val))
 					saveDataMap[date][edbInfoId] = val
 					return
 				}