另存为 最近N年bug

controllers/data_manage/chart_info.go

@@ -124,18 +124,20 @@ func (this *ChartInfoController) ChartInfoSave() {
 
 	seasonExtraConfig := ""
 	if chartItem.ChartType == 2 {
-		if req.SeasonExtraConfig.XStartDate > req.SeasonExtraConfig.XEndDate && req.SeasonExtraConfig.JumpYear != 1 {
-			br.Msg = "季节性图表配置信息异常：横坐标日期配置错误"
-			return
-		}
-		seasonExtra, tErr := json.Marshal(req.SeasonExtraConfig)
-		if tErr != nil {
-			br.Msg = "季节性图表配置信息异常"
-			br.ErrMsg = "季节性图表配置信息异常,Err:" + tErr.Error()
-			return
-		}
+		if req.SeasonExtraConfig.XEndDate != "" {
+			if req.SeasonExtraConfig.XStartDate > req.SeasonExtraConfig.XEndDate && req.SeasonExtraConfig.JumpYear != 1 {
+				br.Msg = "季节性图表配置信息异常：横坐标日期配置错误"
+				return
+			}
+			seasonExtra, tErr := json.Marshal(req.SeasonExtraConfig)
+			if tErr != nil {
+				br.Msg = "季节性图表配置信息异常"
+				br.ErrMsg = "季节性图表配置信息异常,Err:" + tErr.Error()
+				return
+			}
 
-		seasonExtraConfig = string(seasonExtra)
+			seasonExtraConfig = string(seasonExtra)
+		}
 	}
 	err = data_manage.ModifyChartInfoAndMapping(edbInfoIdStr, &req, chartItem.ChartType, seasonExtraConfig)
 	if err != nil {
@@ -2453,6 +2455,7 @@ func (this *ChartInfoController) CopyChartInfo() {
 		Disabled:    oldChartInfo.Disabled,
 		Source:      oldChartInfo.Source,
 		ExtraConfig: oldChartInfo.ExtraConfig,
+		StartYear:   oldChartInfo.StartYear,
 	}
 	newId, err := data_manage.AddChartInfo(chartInfo)
 	if err != nil {

services/data/chart_info.go

@@ -1911,19 +1911,21 @@ func AddChartInfo(req data_manage.AddChartInfoReq, sysUserId int, sysUserRealNam
 
 				// 处理季节性图表横轴配置
 				{
-					if req.SeasonExtraConfig.XStartDate > req.SeasonExtraConfig.XEndDate && req.SeasonExtraConfig.JumpYear != 1 {
-						errMsg = "季节性图表配置信息异常：横坐标日期配置错误"
-						err = errors.New("季节性图表配置信息异常： 横坐标日期配置错误")
-						return
-					}
-					seasonExtra, tErr := json.Marshal(req.SeasonExtraConfig)
-					if tErr != nil {
-						errMsg = "季节性图表配置信息异常"
-						err = errors.New("季节性图表配置信息异常,Err:" + tErr.Error())
-						return
-					}
+					if req.SeasonExtraConfig.XEndDate != "" {
+						if req.SeasonExtraConfig.XStartDate > req.SeasonExtraConfig.XEndDate && req.SeasonExtraConfig.JumpYear != 1 {
+							errMsg = "季节性图表配置信息异常：横坐标日期配置错误"
+							err = errors.New("季节性图表配置信息异常： 横坐标日期配置错误")
+							return
+						}
+						seasonExtra, tErr := json.Marshal(req.SeasonExtraConfig)
+						if tErr != nil {
+							errMsg = "季节性图表配置信息异常"
+							err = errors.New("季节性图表配置信息异常,Err:" + tErr.Error())
+							return
+						}
 
-					seasonExtraConfig = string(seasonExtra)
+						seasonExtraConfig = string(seasonExtra)
+					}
 				}
 			}
 		}
@@ -2245,19 +2247,21 @@ func EditChartInfo(req data_manage.EditChartInfoReq, sysUser *system.Admin) (cha
 
 				// 处理季节性图表横轴配置
 				{
-					if req.SeasonExtraConfig.XStartDate > req.SeasonExtraConfig.XEndDate && req.SeasonExtraConfig.JumpYear != 1 {
-						errMsg = "季节性图表配置信息异常：横坐标日期配置错误"
-						err = errors.New("季节性图表配置信息异常： 横坐标日期配置错误")
-						return
-					}
-					seasonExtra, tErr := json.Marshal(req.SeasonExtraConfig)
-					if tErr != nil {
-						errMsg = "季节性图表配置信息异常"
-						err = errors.New("季节性图表配置信息异常,Err:" + tErr.Error())
-						return
-					}
+					if req.SeasonExtraConfig.XEndDate != "" {
+						if req.SeasonExtraConfig.XStartDate > req.SeasonExtraConfig.XEndDate && req.SeasonExtraConfig.JumpYear != 1 {
+							errMsg = "季节性图表配置信息异常：横坐标日期配置错误"
+							err = errors.New("季节性图表配置信息异常： 横坐标日期配置错误")
+							return
+						}
+						seasonExtra, tErr := json.Marshal(req.SeasonExtraConfig)
+						if tErr != nil {
+							errMsg = "季节性图表配置信息异常"
+							err = errors.New("季节性图表配置信息异常,Err:" + tErr.Error())
+							return
+						}
 
-					seasonExtraConfig = string(seasonExtra)
+						seasonExtraConfig = string(seasonExtra)
+					}
 				}
 			}
 		}