fix bug

models/data_manage/edb_data_quarter.go

@@ -113,7 +113,8 @@ func RefreshCalculateQuarter(edbInfoId, source int, edbCode string) (err error)
 				timestamp := currentHolidayObj.HolidayDate.UnixNano() / 1e6
 				timestampStr := fmt.Sprintf("%d", timestamp)
 				if _, ok := existMap[currentHolidayStr]; !ok {
-					addSql += GetAddSql(edbInfoIdStr, edbCode, currentHolidayStr, timestampStr, findItem.Value)
+					valStr := utils.SubFloatToString(findItem.Value, 4)
+					addSql += GetAddSql(edbInfoIdStr, edbCode, currentHolidayStr, timestampStr, valStr)
 					isAdd = true
 				}
 			}
@@ -137,7 +138,8 @@ func RefreshCalculateQuarter(edbInfoId, source int, edbCode string) (err error)
 					timestamp := currentHolidayFormat.UnixNano() / 1e6
 					timestampStr := fmt.Sprintf("%d", timestamp)
 					if _, ok := existMap[currentHolidayStr]; !ok {
-						addSql += GetAddSql(edbInfoIdStr, edbCode, currentHolidayStr, timestampStr, findItem.Value)
+						valStr := utils.SubFloatToString(findItem.Value, 4)
+						addSql += GetAddSql(edbInfoIdStr, edbCode, currentHolidayStr, timestampStr, valStr)
 						isAdd = true
 					}
 				}
@@ -164,7 +166,8 @@ func RefreshCalculateQuarter(edbInfoId, source int, edbCode string) (err error)
 					timestampStr := fmt.Sprintf("%d", timestamp)
 
 					if _, ok := existMap[currentHolidayStr]; !ok {
-						addSql += GetAddSql(edbInfoIdStr, edbCode, currentHolidayStr, timestampStr, findItem.Value)
+						valStr := utils.SubFloatToString(findItem.Value, 4)
+						addSql += GetAddSql(edbInfoIdStr, edbCode, currentHolidayStr, timestampStr, valStr)
 						isAdd = true
 					}
 				}

models/data_manage/edb_data_table.go

@@ -55,10 +55,10 @@ func GetEdbInfoCalculateTableName(source int) (tableName string) {
 	return
 }
 
-func GetAddSql(edbInfoId, edbCode, dataTime, timestampStr string, value float64) (addSql string) {
+func GetAddSql(edbInfoId, edbCode, dataTime, timestampStr,value string) (addSql string) {
 	nowStr := time.Now().Format(utils.FormatDateTime)
 	addSql += "("
-	addSql += edbInfoId + "," + "'" + edbCode + "'" + "," + "'" + dataTime + "'" + "," + utils.SubFloatToString(value, 4) + "," + "'" + nowStr + "'" +
+	addSql += edbInfoId + "," + "'" + edbCode + "'" + "," + "'" + dataTime + "'" + "," + value + "," + "'" + nowStr + "'" +
 		"," + "'" + nowStr + "'" + "," + "1"
 	addSql += "," + "'" + timestampStr + "'"
 	addSql += "),"

models/data_manage/edb_info_calculate_ljzzy.go

@@ -134,8 +134,9 @@ func RefreshCalculateLjzzy(edbInfoId int, fromEdbInfo *EdbInfo, edbCode, startDa
 					addSql += "),"
 					isAdd = true
 				} else {
-					val = utils.FixFloat(val, 4)
-					err = ModifyEdbDataCalculateLjzzy(int64(edbInfoId), date, val)
+					//val = utils.FixFloat(val, 4)
+					valStr := utils.SubFloatToString(val, 4)
+					err = ModifyEdbDataCalculateLjzzy(int64(edbInfoId), date, valStr)
 					if err != nil {
 						return err
 					}
@@ -188,7 +189,7 @@ func GetEdbDataCalculateLjzzyByCodeAndDate(edbCode string, startDate string) (co
 	return
 }
 
-func ModifyEdbDataCalculateLjzzy(edbInfoId int64, dataTime string, value float64) (err error) {
+func ModifyEdbDataCalculateLjzzy(edbInfoId int64, dataTime,value string) (err error) {
 	o := orm.NewOrm()
 	o.Using("data")
 	sql := ` UPDATE edb_data_calculate_ljzzy SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `

models/data_manage/edb_info_calculate_nszydpjjs.go

@@ -124,8 +124,8 @@ func RefreshCalculateNszydpjjs(edbInfoId, source, formulaInt int, fromEdbInfo *E
 
 			timestamp := currentDate.UnixNano() / 1e6
 			timestampStr := fmt.Sprintf("%d", timestamp)
-
-			addSql += GetAddSql(edbInfoIdStr, edbCode, av, timestampStr, val)
+			valStr := utils.SubFloatToString(val, 4)
+			addSql += GetAddSql(edbInfoIdStr, edbCode, av, timestampStr, valStr)
 			isAdd = true
 		}
 	}

models/data_manage/edb_info_calculate_tbz.go

@@ -25,12 +25,13 @@ type EdbInfoCalculateTbz struct {
 	ModifyTime            time.Time `description:"修改时间"`
 }
 
-func TbzDiv(a, b float64) float64 {
+func TbzDiv(a, b float64) string {
 	af := decimal.NewFromFloat(float64(a))
 	bf := decimal.NewFromFloat(float64(b))
 	val, _ := af.Div(bf).Float64()
 	val = val - 1
-	return val
+	valStr := utils.SubFloatToString(val, 4)
+	return valStr
 }
 
 //刷新同比值数据
@@ -300,7 +301,7 @@ func GetEdbDataCalculateTbzByCodeAndDate(edbCode string, startDate string) (coun
 	return
 }
 
-func ModifyEdbDataCalculateTbz(edbInfoId int64, dataTime string, value float64) (err error) {
+func ModifyEdbDataCalculateTbz(edbInfoId int64, dataTime, value string) (err error) {
 	o := orm.NewOrm()
 	o.Using("data")
 	sql := ` UPDATE edb_data_calculate_tbz SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `

models/data_manage/edb_info_calculate_tcz.go

@@ -26,12 +26,13 @@ type EdbInfoCalculateTcz struct {
 }
 
 
-func TczSub(a, b float64) float64 {
+func TczSub(a, b float64) string {
 	af := decimal.NewFromFloat(float64(a))
 	fmt.Println(af)
 	bf := decimal.NewFromFloat(float64(b))
 	val, _ := af.Sub(bf).Float64()
-	return val
+	valStr := utils.SubFloatToString(val, 4)
+	return valStr
 }
 
 //刷新同差值数据
@@ -301,7 +302,7 @@ func GetEdbDataCalculateTczByCodeAndDate(edbCode string, startDate string) (coun
 	return
 }
 
-func ModifyEdbDataCalculateTcz(edbInfoId int64, dataTime string, value float64) (err error) {
+func ModifyEdbDataCalculateTcz(edbInfoId int64, dataTime,value string) (err error) {
 	o := orm.NewOrm()
 	o.Using("data")
 	sql := ` UPDATE edb_info_calculate_tcz SET value=?,modify_time=NOW() WHERE edb_info_id=? AND data_time=? `