Merge remote-tracking branch 'origin/master'

controllers/data_manage/edb_info_calculate.go

@@ -403,6 +403,7 @@ func (this *ChartInfoController) CalculateEdit() {
 	br.Data = resp
 }
 
+// CalculateBatchSave
 // @Title 累计值转月-同比值-同差等计算新增
 // @Description 累计值转月-同比值-同差等计算新增接口
 // @Param	request	body data_manage.EdbInfoCalculateBatchSaveReq true "type json string"

services/data/correlation/chart_info.go

@@ -320,24 +320,24 @@ func GetChartDataByEdbInfo(edbInfoMappingA, edbInfoMappingB *data_manage.ChartEd
 		baseCalculateData = append(baseCalculateData, baseDataList[i].Value)
 	}
 
-	zeroBaseData := make([]float64, 0)
-	zeroCalculateData := make([]float64, 0)
-	for i := range baseDataTimeArr {
-		tmpBaseVal, ok1 := baseDataMap[baseDataTimeArr[i]]
-		tmpCalculateVal, ok2 := changeDataMap[baseDataTimeArr[i]]
-		if ok1 && ok2 {
-			zeroBaseData = append(zeroBaseData, tmpBaseVal)
-			zeroCalculateData = append(zeroCalculateData, tmpCalculateVal)
-		}
-	}
-	if len(zeroBaseData) != len(zeroCalculateData) {
-		err = fmt.Errorf("相关系数两组序列元素数不一致, %d-%d", len(baseCalculateData), len(zeroCalculateData))
-		return
-	}
-	zeroRatio := utils.CalculateCorrelationByIntArr(zeroBaseData, zeroCalculateData)
-	if leadValue == 0 {
-		yData = append(yData, zeroRatio)
-	}
+	//zeroBaseData := make([]float64, 0)
+	//zeroCalculateData := make([]float64, 0)
+	//for i := range baseDataTimeArr {
+	//	tmpBaseVal, ok1 := baseDataMap[baseDataTimeArr[i]]
+	//	tmpCalculateVal, ok2 := changeDataMap[baseDataTimeArr[i]]
+	//	if ok1 && ok2 {
+	//		zeroBaseData = append(zeroBaseData, tmpBaseVal)
+	//		zeroCalculateData = append(zeroCalculateData, tmpCalculateVal)
+	//	}
+	//}
+	//if len(zeroBaseData) != len(zeroCalculateData) {
+	//	err = fmt.Errorf("相关系数两组序列元素数不一致, %d-%d", len(baseCalculateData), len(zeroCalculateData))
+	//	return
+	//}
+	//zeroRatio := utils.CalculateCorrelationByIntArr(zeroBaseData, zeroCalculateData)
+	//if leadValue == 0 {
+	//	yData = append(yData, zeroRatio)
+	//}
 
 	// 计算领先/滞后N期
 	if leadValue > 0 {
@@ -345,10 +345,10 @@ func GetChartDataByEdbInfo(edbInfoMappingA, edbInfoMappingB *data_manage.ChartEd
 		moveUnitDays := utils.FrequencyDaysMap[leadUnit]
 
 		for i := range xData {
-			if xData[i] == 0 {
-				yData = append(yData, zeroRatio)
-				continue
-			}
+			//if xData[i] == 0 {
+			//	yData = append(yData, zeroRatio)
+			//	continue
+			//}
 			xCalculateData := make([]float64, 0)
 			yCalculateData := make([]float64, 0)