fix

models/predict_edb_data_calculate_nszydbpjjs.go

@@ -156,14 +156,15 @@ func refreshAllPredictCalculateNszydpjjs(to orm.TxOrmer, edbInfoId, source, form
 	fmt.Println("refreshAllCalculateNszydpjjs startDate:", startDate)
 
 	// 获取关联指标数据
-	existDataList, err := GetPredictEdbDataListAllByStartDate(fromEdbInfo, 0, startDate)
-	if err != nil {
-		return
-	}
+	existDataList := make([]*EdbData, 0)
+	dataTableName := GetEdbDataTableName(source)
+	fmt.Println("dataTableName:", dataTableName)
 
-	latestDateStr = fromEdbInfo.LatestDate
+	sql := `SELECT * FROM %s WHERE edb_info_id=? `
+	sql = fmt.Sprintf(sql, dataTableName)
+	_, err = to.Raw(sql, edbInfoId).QueryRows(&existDataList)
 
-	existDataMap := make(map[string]*EdbInfoSearchData)
+	existDataMap := make(map[string]*EdbData)
 	for _, v := range existDataList {
 		existDataMap[v.DataTime] = v
 	}
@@ -179,27 +180,26 @@ func refreshAllPredictCalculateNszydpjjs(to orm.TxOrmer, edbInfoId, source, form
 	}
 
 	//fmt.Println("fromPars:", fromPars)
-	fromDataList, err := GetEdbDataListAllV1ByTo(to, fromCondition, fromPars, fromEdbInfo.Source, 0)
+	fromDataList, err := GetPredictEdbDataListAllByStartDate(fromEdbInfo, 0, startDate)
 	if err != nil {
-		fmt.Println("from GetEdbDataListAll Err:" + err.Error())
 		return
 	}
+	latestDateStr = fromEdbInfo.LatestDate
 
 	var fromDateArr []string
-	fromDataMap := make(map[string]*EdbInfoSearchDataV1)
+	fromDataMap := make(map[string]*EdbInfoSearchData)
 	for _, v := range fromDataList {
 		fromDateArr = append(fromDateArr, v.DataTime)
 		fromDataMap[v.DataTime] = v
 	}
 
-	addSql := ` INSERT INTO edb_data_calculate_nszydpjjs(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
+	addSql := ` INSERT INTO ` + dataTableName + `(edb_info_id,edb_code,data_time,value,create_time,modify_time,data_timestamp) values `
 	var isAdd bool
-	dataTableName := GetEdbDataTableName(source)
 	arrLen := len(fromDateArr)
 	existAddDataMap := make(map[string]string)
 	for ak, av := range fromDateArr {
 		//处理第一个值
-		var valArr []string
+		var valArr []float64
 		if findItem, ok := fromDataMap[av]; ok {
 			valArr = append(valArr, findItem.Value)
 		} else {
@@ -224,7 +224,7 @@ func refreshAllPredictCalculateNszydpjjs(to orm.TxOrmer, edbInfoId, source, form
 		//var totalVal float64
 		totalVal := decimal.NewFromFloat(0.00)
 		for _, v := range valArr {
-			newDecimal, _ := decimal.NewFromString(v)
+			newDecimal := decimal.NewFromFloat(v)
 			totalVal = totalVal.Add(newDecimal)
 		}
 		af := totalVal //decimal.NewFromFloat(totalVal)
@@ -251,7 +251,7 @@ func refreshAllPredictCalculateNszydpjjs(to orm.TxOrmer, edbInfoId, source, form
 			}
 			existAddDataMap[av] = av
 		} else {
-			existValDecimal := decimal.NewFromFloat(existVal.Value)
+			existValDecimal, _ := decimal.NewFromString(existVal.Value)
 			existStr := existValDecimal.String()
 			fmt.Println(existStr, valStr, av)
 			if existStr != valStr {