Merge branch 'feature/eta1.9.7_interval_analysis' into debug

controllers/data_manage/range_analysis/chart_info.go

@@ -171,7 +171,9 @@ func (this *RangeChartChartInfoController) Add() {
 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
 		return
 	}
-
+	if req.DateType == 0 {
+		req.DateType = 3
+	}
 	chartInfo, err, errMsg, isSendEmail := rangeServ.AddChartInfo(req, utils.CHART_SOURCE_RANGE_ANALYSIS, sysUser, this.Lang)
 	if err != nil {
 		br.Msg = "保存失败"

services/data/range_analysis/chart_info.go

@@ -1122,9 +1122,10 @@ func AddChartInfo(req data_manage.AddChartInfoReq, source int, sysUser *system.A
 	chartInfo.UniqueCode = utils.MD5(utils.CHART_PREFIX + "_" + timestamp)
 	chartInfo.ChartType = 1 // 区间计算图
 	chartInfo.Calendar = "公历"
-	chartInfo.DateType = 6
+	chartInfo.DateType = req.DateType
 	chartInfo.StartDate = req.StartDate
 	chartInfo.EndDate = req.EndDate
+	chartInfo.StartYear = req.StartYear
 	chartInfo.SeasonStartDate = req.StartDate
 	chartInfo.SeasonEndDate = req.EndDate
 	chartInfo.LeftMin = req.LeftMin