Merge branch 'feature/eta1.5.6_excel' into debug

controllers/data_manage/edb_info.go

@@ -4634,6 +4634,7 @@ func (this *EdbInfoController) GetEdbBeforeAndAfterDateData() {
 		br.ErrMsg = "指标类型异常，Err:" + strconv.Itoa(edbInfo.EdbInfoType)
 		return
 	}
+
 	if currDate == `` {
 		currDate, err = excel2.GetEdbDateByMoveForward(requestBody, dataList)
 		if err != nil {
@@ -4644,9 +4645,12 @@ func (this *EdbInfoController) GetEdbBeforeAndAfterDateData() {
 	} else {
 		if strings.Count(currDate, "-") == 1 {
 			currDate = currDate + "-01"
-			//dateType = "month"
-		} else if strings.Count(currDate, "-") == 0 {
-			currDate = currDate + "-01-01"
+			// 查找这个月早的时间作为起始时间
+			for _, v := range dataList {
+				if v.DataTime >= currDate {
+					currDate = v.DataTime
+				}
+			}
 		}
 	}
 	currDate, err = excel2.HandleMixTableDateChange(currDate, requestBody)
@@ -4663,7 +4667,7 @@ func (this *EdbInfoController) GetEdbBeforeAndAfterDateData() {
 		br.ErrMsg = fmt.Sprint("获取后面的指数据失败,Err:", err.Error())
 		return
 	}
-	// todo 如果list 是空值，是否默认返回最新的记录
+	// 这个日期不存在的话直接返回空数组
 	resp := data_manage.BeforeAndAfterDateDataResp{
 		List: list,
 		Date: currDate,

controllers/data_manage/excel/mixed_table.go

@@ -214,6 +214,15 @@ func (c *ExcelInfoController) CalculateData() {
 		}
 	} else {
 		newDate = req.DataTime //选择表格中的日期
+		if strings.Count(newDate, "-") == 1 {
+			newDate = newDate + "-01"
+			// 查找这个月早的时间作为起始时间
+			for _, v := range respItem.Data.DateList {
+				if v >= newDate {
+					newDate = v
+				}
+			}
+		}
 	}
 	// 开始做日期变换
 	newDate, err = excel2.HandleMixTableDateChange(newDate, requestBody)
@@ -295,9 +304,10 @@ func (c *ExcelInfoController) CalculateData() {
 		}
 	}
 	resp := data_manage.BeforeAndAfterDateDataResp{
-		List:      dataListResp,
-		Date:      newDate,
-		ShowValue: utils.FormatTableDataShowValue(finalVal),
+		List: dataListResp,
+		Date: newDate,
+		//ShowValue: utils.FormatTableDataShowValue(finalVal),
+		ShowValue: finalVal,
 	}
 	br.Ret = 200
 	br.Success = true

models/data_manage/edb_info.go

@@ -1664,7 +1664,7 @@ type TraceEdbInfoResp struct {
 type BeforeAndAfterDateDataResp struct {
 	List      []*EdbDataList `description:"list"`
 	Date      string         `description:"实际日期"`
-	ShowValue string         `description:"展示值"`
+	ShowValue float64        `description:"展示值"`
 }
 
 // GetEdbInfoAdminList

models/data_manage/excel/request/mixed_table.go

@@ -112,7 +112,7 @@ type MixDateCalculateConf struct {
 // MixDateCalculateTag 混合表格中的日期计算的关联单元格
 type MixDateCalculateTag struct {
 	Uid string `description:"单元格唯一值"`
-	Tag string `description:"指标对应标签"`
+	Tag string `description:"单元格对应标签"`
 }
 
 // MixDateCalculateTagReq 混合表格中的日期计算的关联单元格

services/data/edb_data.go

@@ -368,7 +368,7 @@ func GetEdbBeforeAndAfterDateData(targetDate string, dataList []*data_manage.Edb
 	startIndex := 0
 	endIndex := 0
 	for index, v := range dataList {
-		if v.DataTime >= targetDate {
+		if v.DataTime == targetDate {
 			if index+2 > maxIndex {
 				endIndex = maxIndex
 			} else if index+1 > maxIndex {

services/data/excel/mixed_table.go

@@ -73,7 +73,7 @@ func GetMixedTableCellData(mixedTableReq request.MixedTableReq) (newMixedTableCe
 	// 日度指标数据map
 	edbDayDataListMap := make(map[int]map[string]float64)
 	// 月度指标数据map
-	edbMonthDataListMap := make(map[int]map[string]float64)
+	edbMonthDataListMap := make(map[int]map[string]string)
 	// 日度指标数据map
 	edbDataListMap := make(map[int][]*data_manage.EdbDataList)
 	for _, edbInfo := range edbInfoList {
@@ -90,18 +90,19 @@ func GetMixedTableCellData(mixedTableReq request.MixedTableReq) (newMixedTableCe
 		}
 
 		dateValMap := make(map[string]float64)
-		monthValMap := make(map[string]float64)
+		monthDateMap := make(map[string]string)
 		for _, tmpData := range dataList {
 			// 日度数据
 			dateValMap[tmpData.DataTime] = tmpData.Value
 			// 月度数据（取该月份的第一个数据）
 			yearMonth := strings.Join(strings.Split(tmpData.DataTime, "-")[0:2], "-")
-			if _, ok := monthValMap[yearMonth]; !ok {
-				monthValMap[yearMonth] = tmpData.Value
+			if _, ok := monthDateMap[yearMonth]; !ok {
+				// 存最早的时间
+				monthDateMap[yearMonth] = tmpData.DataTime
 			}
 		}
 		edbDayDataListMap[edbInfo.EdbInfoId] = dateValMap
-		edbMonthDataListMap[edbInfo.EdbInfoId] = monthValMap
+		edbMonthDataListMap[edbInfo.EdbInfoId] = monthDateMap
 		edbDataListMap[edbInfo.EdbInfoId] = dataList
 	}
 
@@ -246,22 +247,36 @@ func GetMixedTableCellData(mixedTableReq request.MixedTableReq) (newMixedTableCe
 					} else {
 						tmpDateList := strings.Split(cell.DataTime, "-")
 						tmpDateValMap := make(map[string]float64)
+						var newDate string
 						if len(tmpDateList) == 2 {
 							//月度数据
-							if dateValMap, ok := edbMonthDataListMap[cell.EdbInfoId]; ok {
-								tmpDateValMap = dateValMap
+							if dateMap, ok1 := edbMonthDataListMap[cell.EdbInfoId]; ok1 {
+								if d, ok2 := dateMap[cell.DataTime]; ok2 {
+									newDate = d
+								}
 							}
 						} else {
 							// 日度数据
-							if dateValMap, ok := edbDayDataListMap[cell.EdbInfoId]; ok {
-								tmpDateValMap = dateValMap
-							}
+							newDate = cell.DataTime
+						}
+						// 日期变换后才能确定最后的时间
+						//做期数前移动和日期变换
+						if !strings.Contains(cell.Value, "{") {
+							cell.Value = ""
+						}
 
+						newDate, err = HandleMixTableDateChange(newDate, cell.Value)
+						if err != nil {
+							return
 						}
-						if val, ok2 := tmpDateValMap[cell.DataTime]; ok2 {
-							//cell.ShowValue = fmt.Sprint(val)
-							cellKeyVal[cell.Uid] = val
-							cell.ShowValue = utils.FormatTableDataShowValue(val)
+
+						if dateValMap, ok3 := edbDayDataListMap[cell.EdbInfoId]; ok3 {
+							tmpDateValMap = dateValMap
+							if val, ok2 := tmpDateValMap[cell.DataTime]; ok2 {
+								//cell.ShowValue = fmt.Sprint(val)
+								cellKeyVal[cell.Uid] = val
+								cell.ShowValue = utils.FormatTableDataShowValue(val)
+							}
 						}
 					}
 				}