Merge branch 'fix_2022_0222' of hongze/hongze_yb into master

controller/activity/activity.go

@@ -200,7 +200,7 @@ func GetActivityShareImg(c *gin.Context)  {
 		"Sunday":    "星期日",
 	}
 	weekStr := WeekDayMap[activityWeek]
-	dateStr := "活动时间：" + activityDate
+	dateStr := "会议时间：" + activityDate
 	timeStr := activityStart + "-" + activityEnd + " " + weekStr
 
 	// 获取原分享图

controller/chart/chart_info.go

@@ -52,12 +52,12 @@ func GetChartInfoDetail(c *gin.Context)  {
 	reqChartType := c.DefaultQuery("ChartType", "")
 	chartType, _ := strconv.Atoi(reqChartType)
 	// 季节性图表时间
-	seasonStartDate := c.DefaultQuery("SeasonStartDate", "")
-	seasonEndDate := c.DefaultQuery("SeasonEndDate", "")
+	reqSeasonStartDate := c.DefaultQuery("SeasonStartDate", "")
+	reqSeasonEndDate := c.DefaultQuery("SeasonEndDate", "")
 	// 指标ID
 	edbInfoId := c.DefaultQuery("EdbInfoId", "")
 	// 公历/农历
-	calendar := c.DefaultQuery("Calendar", "公历")
+	reqCalendar := c.DefaultQuery("Calendar", "")
 
 	// 获取图表信息
 	var err error
@@ -72,6 +72,10 @@ func GetChartInfoDetail(c *gin.Context)  {
 		return
 	}
 	chartType = chartInfo.ChartType
+	calendar := chartInfo.Calendar
+	if reqCalendar != "" {
+		calendar = reqCalendar
+	}
 
 	// 时段筛选
 	reqDateType := c.DefaultQuery("DateType", "")
@@ -116,6 +120,17 @@ func GetChartInfoDetail(c *gin.Context)  {
 
 	if chartType == 2 {
 		// 季节性图表
+		var seasonStartDate, seasonEndDate string
+		if reqSeasonStartDate == "" {
+			seasonStartDate = chartInfo.SeasonStartDate
+		} else {
+			seasonStartDate = reqSeasonStartDate
+		}
+		if reqSeasonEndDate == "" {
+			seasonEndDate = chartInfo.SeasonEndDate
+		} else {
+			seasonEndDate = reqSeasonEndDate
+		}
 		if seasonStartDate != "" {
 			startDate = seasonStartDate + "-01-01"
 		} else {
@@ -125,7 +140,7 @@ func GetChartInfoDetail(c *gin.Context)  {
 		if seasonEndDate != "" {
 			endDate = seasonEndDate + "-12-31"
 		} else {
-			endDate = ""
+			endDate = time.Now().Format(utils.FormatDate)
 		}
 	}
 
@@ -148,9 +163,9 @@ func GetChartInfoDetail(c *gin.Context)  {
 	}
 
 	// 指标列表
-	edbList := make([]*chartEdbMappingModel.ChartEdbInfoMapping, 0)
+	edbList := make([]*chartEdbMappingModel.ChartEdbInfoMappingList, 0)
 	for _, v := range mappingList {
-		item := new(chartEdbMappingModel.ChartEdbInfoMapping)
+		item := new(chartEdbMappingModel.ChartEdbInfoMappingList)
 		item.EdbInfoId = v.EdbInfoId
 		item.SourceName = v.SourceName
 		item.Source = v.Source
@@ -234,11 +249,11 @@ func GetChartInfoDetail(c *gin.Context)  {
 				return
 			}
 			calendarPreYear = newStartDateReal.Year() - 1
-			//newStartDateReal = newStartDateReal.AddDate(-1, 0, 0)
+			newStartDateReal = newStartDateReal.AddDate(-1, 0, 0)
 			startDateReal = newStartDateReal.Format(utils.FormatDate)
 		}
 		dataList := make([]*edbDataModel.EdbDataList, 0)
-		//fmt.Println("chart:", v.Source, v.EdbInfoId, startDateReal, endDate)
+		fmt.Println("chart:", v.Source, v.EdbInfoId, startDateReal, endDate)
 		dataList, err = edbDataModel.GetEdbDataList(v.Source, v.EdbInfoId, startDateReal, endDate)
 		if err != nil {
 			response.FailMsg("获取失败", "获取图表指标信息失败4003, Err:" + err.Error(), c)

models/response/chart_info/chart_info.go

@@ -7,5 +7,5 @@ import (
 
 type ChartInfoDetailResp struct {
 	ChartInfo   *chart_info.ChartInfoView
-	EdbInfoList []*chart_edb_mapping.ChartEdbInfoMapping
+	EdbInfoList []*chart_edb_mapping.ChartEdbInfoMappingList
 }

models/tables/chart_edb_mapping/query.go

@@ -31,7 +31,11 @@ type ChartEdbInfoMapping struct {
 	UniqueCode        string  `description:"指标唯一编码"`
 	MinValue          float64 `json:"-" description:"最小值"`
 	MaxValue          float64 `json:"-" description:"最大值"`
-	DataList          interface{}
+}
+
+type ChartEdbInfoMappingList struct {
+	ChartEdbInfoMapping
+	DataList	interface{}
 }
 
 // GetMappingListByChartInfoId 根据图表ID获取指标映射列表