fix:手工数据刷新时，过滤掉日期为0000-00-00的数据

models/base_from_lt.go

@@ -3,6 +3,7 @@ package models
 import (
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
+	"github.com/shopspring/decimal"
 	"hongze/hongze_edb_lib/utils"
 	"reflect"
 	"strconv"
@@ -12,7 +13,7 @@ import (
 
 //路透
 
-//新增路透指标数据
+// 新增路透指标数据
 func AddEdbDataFromLt(edbCode string, ltDataList map[int64]interface{}) (err error) {
 	o := orm.NewOrm()
 	if len(ltDataList) > 0 {
@@ -52,7 +53,7 @@ func AddEdbDataFromLt(edbCode string, ltDataList map[int64]interface{}) (err err
 	return
 }
 
-//刷新路透指标数据
+// 刷新路透指标数据
 func RefreshEdbDataFromLt(edbInfoId int, edbCode, startDate string, ltDataList map[int64]interface{}) (err error) {
 	source := utils.DATA_SOURCE_LT
 	o := orm.NewOrm()
@@ -99,7 +100,8 @@ func RefreshEdbDataFromLt(edbInfoId int, edbCode, startDate string, ltDataList m
 			return err
 		}
 
-		saveValue := utils.SubFloatToString(sValue, 30)
+		saveValue := decimal.NewFromFloat(sValue).Round(4).String()
+		//saveValue := utils.SubFloatToString(sValue, 30)
 		if findItem, ok := existMap[eDate]; !ok {
 			timestamp := dataTime.UnixNano() / 1e6
 			timeStr := fmt.Sprintf("%d", timestamp)

models/base_from_manual.go

@@ -29,7 +29,7 @@ func GetEdbdataManualByCondition(condition string, pars []interface{}) (item []*
 	return
 }
 
-//新增弘则手工指标数据
+// 新增弘则手工指标数据
 func AddEdbDataFromManual(edbCode string) (err error) {
 	o := orm.NewOrm()
 
@@ -74,7 +74,7 @@ func AddEdbDataFromManual(edbCode string) (err error) {
 	return
 }
 
-//刷新手工指标数据
+// 刷新手工指标数据
 func RefreshEdbDataFromManual(edbInfoId int, edbCode, startDate string) (err error) {
 	source := utils.DATA_SOURCE_MANUAL
 	o := orm.NewOrm()
@@ -94,6 +94,9 @@ func RefreshEdbDataFromManual(edbInfoId int, edbCode, startDate string) (err err
 	if startDate != "" {
 		condition += " AND DT>=? "
 		pars = append(pars, startDate)
+	} else {
+		condition += " AND DT != ? "
+		pars = append(pars, `0000-00-00`)
 	}
 
 	manualDataList, err := GetEdbdataManualByCondition(condition, pars)