|
|
@@ -60,6 +60,8 @@ func ModifyChartInfoAndMapping(edbInfoIdStr string, req *chartInfoModel.SaveChar
|
|
|
edb_info_ids = ?,
|
|
|
modify_time = NOW(),
|
|
|
calendar = ?,
|
|
|
+ start_date = ?,
|
|
|
+ end_date = ?,
|
|
|
season_start_date = ?,
|
|
|
season_end_date = ?,
|
|
|
left_min = ?,
|
|
|
@@ -67,7 +69,7 @@ func ModifyChartInfoAndMapping(edbInfoIdStr string, req *chartInfoModel.SaveChar
|
|
|
right_min = ?,
|
|
|
right_max = ?,extra_config = ?
|
|
|
WHERE chart_info_id = ?`
|
|
|
- err = tx.Exec(sql, edbInfoIdStr, req.Calendar, req.SeasonStartDate, req.SeasonEndDate, req.LeftMin, req.LeftMax, req.RightMin, req.RightMax, req.ExtraConfig, req.ChartInfoId).Error
|
|
|
+ err = tx.Exec(sql, edbInfoIdStr, req.Calendar, req.StartDate, req.EndDate, req.StartDate, req.EndDate, req.LeftMin, req.LeftMax, req.RightMin, req.RightMax, req.ExtraConfig, req.ChartInfoId).Error
|
|
|
}
|
|
|
if err != nil {
|
|
|
fmt.Println("UPDATE chart_info Err:", err.Error())
|
|
|
@@ -823,7 +825,7 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*edbDataModel.EdbDataList, lates
|
|
|
itemList := quarterMap[k]
|
|
|
quarterItem := new(edbDataModel.QuarterData)
|
|
|
quarterItem.Years = v.ShowName
|
|
|
- quarterItem.Year = v.ShowName
|
|
|
+ quarterItem.Year = v.ChartLegend
|
|
|
quarterItem.ChartLegend = v.ChartLegend
|
|
|
if le, ok := legendMap[v.ShowName]; ok {
|
|
|
quarterItem.ChartLegend = le
|
|
|
@@ -1075,7 +1077,7 @@ func GetSeasonEdbInfoDataListByXDateNong(result *edbDataModel.EdbDataResult, lat
|
|
|
itemList := quarterMap[k]
|
|
|
quarterItem := new(edbDataModel.QuarterData)
|
|
|
quarterItem.Years = v.ShowName
|
|
|
- quarterItem.Year = v.ShowName
|
|
|
+ quarterItem.Year = v.ChartLegend
|
|
|
quarterItem.ChartLegend = v.ChartLegend
|
|
|
if le, ok := legendMap[v.ShowName]; ok {
|
|
|
quarterItem.ChartLegend = le
|
