|
|
@@ -1240,7 +1240,7 @@ func GetMixedTableCellData(config [][]request.MixedTableCellDataReq) (newMixedTa
|
|
|
for _, cell := range row {
|
|
|
if cell.DataType == 2 {
|
|
|
edbInfoIdList = append(edbInfoIdList, cell.EdbInfoId)
|
|
|
- } else if cell.DataType == 4 {
|
|
|
+ } else if utils.InArrayByInt([]int{4, 5}, cell.DataType) {
|
|
|
dataEdbInfoIdList = append(dataEdbInfoIdList, cell.EdbInfoId)
|
|
|
}
|
|
|
}
|
|
|
@@ -1291,7 +1291,7 @@ func GetMixedTableCellData(config [][]request.MixedTableCellDataReq) (newMixedTa
|
|
|
if edbInfo, ok := edbInfoMap[cell.EdbInfoId]; ok {
|
|
|
cell.ShowValue = edbInfo.EdbName
|
|
|
}
|
|
|
- } else if cell.DataType == 4 {
|
|
|
+ } else if utils.InArrayByInt([]int{4, 5}, cell.DataType) {
|
|
|
tmpDateList := strings.Split(cell.DataTime, "-")
|
|
|
tmpDateValMap := make(map[string]float64)
|
|
|
if len(tmpDateList) == 2 {
|
