日期计算

controllers/data_manage/chart_info_section.go

@@ -256,60 +256,14 @@ func (this *ChartInfoController) PreviewSectionCombineDateCalculate() {
 		}
 	}
 	var findDate string
-	if req.DateType == 0 {
-		findDate, err = data.GetChartSectionSeriesDateByDateChange(req.EdbInfoId, dataList, req.DateChange, req.MoveForward)
-		if err != nil {
-			br.Msg = "指标数据查询失败！"
-			br.ErrMsg = "指标数据查询失败，Err:" + err.Error()
-			return
-		}
-	} else {
-		// 获取日期配置
-		dateConfListMap := make(map[string]*data_manage.ChartSectionDateConfItem)
-		dateConfEdbIds := make([]int, 0)
-		for _, v := range req.DateConfList {
-			if v.EdbInfoId > 0 {
-				dateConfEdbIds = append(dateConfEdbIds, v.EdbInfoId)
-			}
-			dateConfListMap[v.DateConfName] = v
-		}
-		dateConfItem, ok1 := dateConfListMap[req.DateConfName]
-		if !ok1 {
-			br.Msg = "引用日期配置不存在"
-			return
-		}
-		// todo 根据日期变换得到最终日期
-		edbDataListTmp := make([]*data_manage.EdbDataList, 0)
-		if dateConfItem.EdbInfoId > 0 {
-			dateConfItemeEdbInfo, e := data_manage.GetEdbInfoById(dateConfItem.EdbInfoId)
-			if e != nil {
-				br.Msg = "指标查询失败！"
-				br.ErrMsg = "指标查询失败，Err:" + e.Error()
-				return
-			}
-			startDateReal := ""
-			endDate := ""
-			switch dateConfItemeEdbInfo.EdbInfoType {
-			case 0:
-				edbDataListTmp, err = data_manage.GetEdbDataList(dateConfItemeEdbInfo.Source, dateConfItemeEdbInfo.SubSource, dateConfItemeEdbInfo.EdbInfoId, startDateReal, endDate)
-			case 1:
-				_, edbDataListTmp, _, _, err, _ = data.GetPredictDataListByPredictEdbInfoId(dateConfItemeEdbInfo.EdbInfoId, startDateReal, endDate, true)
-			default:
-				err = errors.New(fmt.Sprint("获取失败,指标类型异常", dateConfItemeEdbInfo.EdbInfoType))
-			}
-			if err != nil {
-				br.Msg = "指标数据查询失败！"
-				br.ErrMsg = "指标数据查询失败，Err:" + err.Error()
-				return
-			}
-			findDate, err = data.GetChartSectionSeriesDateByDateChange(dateConfItem.EdbInfoId, edbDataListTmp, dateConfItem.DateChange, dateConfItem.MoveForward)
-			if err != nil {
-				br.Msg = "指标数据查询失败！"
-				br.ErrMsg = fmt.Sprintf("指标%d的日期变换处理失败", dateConfItem.EdbInfoId)
-				return
-			}
-		}
-
+	if req.DateType == 1 {
+		req.EdbInfoId = 0
+	}
+	findDate, err = data.GetChartSectionSeriesDateByDateChange(req.EdbInfoId, dataList, req.DateChange, req.MoveForward)
+	if err != nil {
+		br.Msg = "指标数据查询失败！"
+		br.ErrMsg = "指标数据查询失败，Err:" + err.Error()
+		return
 	}
 
 	if findDate == "" {