混合表格 指标计算

controllers/data_manage/excel/mixed_table.go

@@ -204,7 +204,7 @@ func (c *ExcelInfoController) CalculateData() {
 		num = lenDate
 	}
 
-	//dataListResp := make([]*data_manage.EdbDataList, 0)
+	dataListResp := make([]*data_manage.EdbDataList, 0)
 
 	var newDate string
 	if req.DataTime == `` { //选择前移几期数
@@ -241,16 +241,16 @@ func (c *ExcelInfoController) CalculateData() {
 			if date == newDate {
 				finalVal = val
 			}
-			/*dataListResp = append(dataListResp, &data_manage.EdbDataList{
+			dataListResp = append(dataListResp, &data_manage.EdbDataList{
 				Value:    val,
 				DataTime: date,
-			})*/
+			})
 		}
 	} else {
 		// todo 如果选择了表格中的日期应该如何处理
 		if val, ok := respItem.Data.DataMap[newDate]; ok {
 			finalVal = val
-			/*for i, tmpDate := range respItem.Data.DateList {
+			for i, tmpDate := range respItem.Data.DateList {
 				if tmpDate == newDate {
 					if i+3 <= lenDate {
 						t1Date := respItem.Data.DateList[i+2]
@@ -300,13 +300,14 @@ 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

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