Browse Source

批量计算求和

xyxie 1 year ago
parent
commit
cde58552cd
2 changed files with 6 additions and 0 deletions
  1. 3 0
      models/edb_data_calculate_avg.go
  2. 3 0
      models/edb_data_calculate_sum.go

+ 3 - 0
models/edb_data_calculate_avg.go

@@ -385,6 +385,9 @@ func (obj CalculateAvg) refresh(to orm.TxOrmer, edbInfoId, source, subSource int
 	existDataMap := make(map[string]string)
 
 	for sk, sv := range saveDataMap {
+		if _, ok := dateMap[sk]; !ok {
+			continue
+		}
 		// 当空值处理类型选择了不计算时,只要有一个指标在某个日期没有值(即空值),则计算指标在该日期没有值
 		if emptyType == 1 {
 			if len(sv) != len(edbInfoIdArr) {

+ 3 - 0
models/edb_data_calculate_sum.go

@@ -391,6 +391,9 @@ func (obj CalculateSum) refresh(to orm.TxOrmer, edbInfoId, source, subSource int
 	existDataMap := make(map[string]string)
 
 	for sk, sv := range saveDataMap {
+		if _, ok := dateMap[sk]; !ok {
+			continue
+		}
 		// 当空值处理类型选择了不计算时,只要有一个指标在某个日期没有值(即空值),则计算指标在该日期没有值
 		if emptyType == 1 {
 			if len(sv) != len(edbInfoIdArr) {