Ver Fonte

累计值专月,bug修复

317699326@qq.com há 2 dias atrás
pai
commit
69adbd93a8
2 ficheiros alterados com 6 adições e 4 exclusões
  1. 6 3
      models/edb_data_calculate_ljzzy.go
  2. 0 1
      models/edb_info.go

+ 6 - 3
models/edb_data_calculate_ljzzy.go

@@ -258,8 +258,6 @@ func refreshAllCalculateLjzzy(to *gorm.DB, edbInfoId, source, subSource int, fro
 			var date string
 			var val float64
 
-			//fmt.Println("delete:", yk, i, yv[i], dataCurrentItem)
-
 			if dataCurrentItem != nil {
 				if i == 1 || i == 2 {
 					if _, mok := yv[1]; mok { //1月有值
@@ -318,7 +316,8 @@ func refreshAllCalculateLjzzy(to *gorm.DB, edbInfoId, source, subSource int, fro
 					}
 				}
 			} else {
-				if i == 1 && len(yv) > 1 {
+
+				if i == 1 {
 					_, mok := yv[1]
 					_, tok := yv[2]
 
@@ -327,6 +326,10 @@ func refreshAllCalculateLjzzy(to *gorm.DB, edbInfoId, source, subSource int, fro
 						month := strconv.Itoa(i)
 						_, date = utils.GetMonthStartAndEnd(year, month)
 						delete(removeDateMap, date)
+						val = yv[2].Value
+						a := decimal.NewFromFloat(val)
+						b := decimal.NewFromFloat(2.0)
+						val, _ = a.Div(b).Float64()
 					}
 				}
 			}

+ 0 - 1
models/edb_info.go

@@ -473,7 +473,6 @@ func GetEdbDataListAllByMysqlTo(to *gorm.DB, source, subSource int, findEdbDataL
 	//for _, v := range items {
 	//	v.ConvertTimeStr()
 	//}
-
 	return
 }