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

controllers/data_manage/excel/mixed_table.go

@@ -87,12 +87,14 @@ func (c *ExcelInfoController) GetSystemDate() {
 		} else {
 			date = req.DataTime //选择表格中的日期
 		}
-		// 开始做日期变换
-		date, err = excel2.HandleMixTableDateChange(date, req.Value)
-		if err != nil {
-			br.Msg = "日期变换失败！"
-			br.ErrMsg = "日期变换失败，Err:" + err.Error()
-			return
+		if date != "" {
+			// 开始做日期变换
+			date, err = excel2.HandleMixTableDateChange(date, req.Value)
+			if err != nil {
+				br.Msg = "日期变换失败！"
+				br.ErrMsg = "日期变换失败，Err:" + err.Error()
+				return
+			}
 		}
 	}
 
@@ -304,10 +306,9 @@ func (c *ExcelInfoController) CalculateData() {
 		}
 	}
 	resp := data_manage.BeforeAndAfterDateDataResp{
-		List: dataListResp,
-		Date: newDate,
-		//ShowValue: utils.FormatTableDataShowValue(finalVal),
-		ShowValue: finalVal,
+		List:      dataListResp,
+		Date:      newDate,
+		ShowValue: utils.FormatTableDataShowValue(finalVal),
 	}
 	br.Ret = 200
 	br.Success = true

models/data_manage/edb_info.go

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

services/data/excel/mixed_table.go

@@ -242,7 +242,7 @@ func GetMixedTableCellData(mixedTableReq request.MixedTableReq) (newMixedTableCe
 									}
 								}
 								cellKeyVal[cell.Uid] = finalVal
-								cell.ShowValue = utils.FormatTableDataShowValue(dateValList[tmpLenData-1].Value)
+								cell.ShowValue = utils.FormatTableDataShowValue(finalVal)
 							}
 						}
 					} else {
@@ -732,7 +732,7 @@ func HandleMixTableDateChange(date, conf string) (newDate string, err error) {
 	}
 
 	if newDate == "" {
-		err = fmt.Errorf("日期配置失败: %s", conf)
+		err = fmt.Errorf("日期为空")
 		return
 	}
 	if len(edbDateConf.DateChange) > 0 {