|
@@ -369,9 +369,6 @@ func refreshAllCalculate(to orm.TxOrmer, edbInfoIdArr []*EdbInfo, edbInfoId, sou
|
|
|
dateList := make([]string, 0) // 第一个指标的日期数据
|
|
|
|
|
|
for edbInfoIndex, v := range edbInfoIdArr {
|
|
|
- if v.EdbInfoId == 103344 {
|
|
|
- fmt.Println(v.EdbInfoId)
|
|
|
- }
|
|
|
var condition string
|
|
|
var pars []interface{}
|
|
|
condition += " AND edb_info_id=? "
|
|
@@ -393,9 +390,6 @@ func refreshAllCalculate(to orm.TxOrmer, edbInfoIdArr []*EdbInfo, edbInfoId, sou
|
|
|
lenData := len(dataList)
|
|
|
|
|
|
for _, dv := range dataList {
|
|
|
- if dv.DataTime == "2023-09-21" || dv.DataTime == "2023-09-22" {
|
|
|
- fmt.Println(v.EdbInfoId)
|
|
|
- }
|
|
|
if val, ok := realSaveDataMap[dv.DataTime]; ok {
|
|
|
if _, ok := val[v.EdbInfoId]; !ok {
|
|
|
val[v.EdbInfoId] = dv.Value
|
|
@@ -464,9 +458,6 @@ func refreshAllCalculate(to orm.TxOrmer, edbInfoIdArr []*EdbInfo, edbInfoId, sou
|
|
|
for sk, sv := range saveDataMap {
|
|
|
//fmt.Println(sk, sv)
|
|
|
formulaStr = strings.ToUpper(formulaStr)
|
|
|
- if sk == "2023-09-22" {
|
|
|
- fmt.Println(sk)
|
|
|
- }
|
|
|
formulaFormStr := ReplaceFormula(edbInfoIdArr, sv, formulaMap, formulaStr, edbInfoIdBytes)
|
|
|
//计算公式异常,那么就移除该指标
|
|
|
if formulaFormStr == `` {
|
|
@@ -680,9 +671,6 @@ func CheckFormula2(edbInfoArr []*EdbInfo, formulaMap map[string]string, formulaS
|
|
|
// 处理整个数据
|
|
|
func handleDateSaveDataMap(dateList []string, maxStartDate, minLatestDate time.Time, realSaveDataMap, saveDataMap map[string]map[int]float64, edbInfoIdArr []*EdbInfo) {
|
|
|
for _, date := range dateList {
|
|
|
- if date > "2023-09-15" {
|
|
|
- fmt.Println(date)
|
|
|
- }
|
|
|
dateTime, _ := time.ParseInLocation(utils.FormatDate, date, time.Local)
|
|
|
// 如果当前日期早于数据的最大开始日期,那么不处理,进入下一个循环
|
|
|
if dateTime.Before(maxStartDate) {
|