瀏覽代碼

fix:图表保存

Roc 3 月之前
父節點
當前提交
5c2f93a858

+ 1 - 1
controllers/data_manage/chart_info.go

@@ -2038,7 +2038,7 @@ func (this *ChartInfoController) ChartInfoEdbInfoDetail() {
 	mapping.ChartInfoId = 0
 	mapping.MaxData = maxData
 	mapping.MinData = minData
-	mapping.IsOrder = false
+	mapping.IsOrder = 0
 	mapping.IsAxis = 1
 	mapping.EdbInfoType = 1
 	mapping.LeadValue = 0

+ 3 - 3
controllers/data_manage/correlation/correlation_chart_info.go

@@ -1328,7 +1328,7 @@ func (this *CorrelationChartInfoController) Copy() {
 				m.EdbInfoId = v.EdbInfoId
 				edbTimestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
 				m.UniqueCode = utils.MD5(utils.CHART_PREFIX + "_" + edbTimestamp + "_" + strconv.Itoa(v.EdbInfoId))
-				m.IsOrder = true
+				m.IsOrder = 1
 				m.IsAxis = 1
 				m.EdbInfoType = 1
 				m.Source = utils.CHART_SOURCE_CORRELATION
@@ -2382,7 +2382,7 @@ func (this *CorrelationChartInfoController) MultiFactorAdd() {
 		m.ModifyTime = time.Now()
 		edbTimestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
 		m.UniqueCode = utils.MD5(utils.CHART_PREFIX + "_" + edbTimestamp + "_" + strconv.Itoa(v))
-		m.IsOrder = true
+		m.IsOrder = 1
 		m.IsAxis = 1
 		m.EdbInfoType = 1
 		m.Source = utils.CHART_SOURCE_CORRELATION
@@ -2778,7 +2778,7 @@ func (this *CorrelationChartInfoController) MultiFactorEdit() {
 		m.ModifyTime = time.Now()
 		edbTimestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
 		m.UniqueCode = utils.MD5(utils.CHART_PREFIX + "_" + edbTimestamp + "_" + strconv.Itoa(v))
-		m.IsOrder = true
+		m.IsOrder = 1
 		m.IsAxis = 1
 		m.EdbInfoType = 1
 		m.Source = utils.CHART_SOURCE_CORRELATION

+ 1 - 1
controllers/data_manage/edb_info.go

@@ -4514,7 +4514,7 @@ func (this *EdbInfoController) RelationEdbList() {
 			item.LeadUnit = ""
 			item.ChartEdbMappingId = 0
 			item.ChartInfoId = 0
-			item.IsOrder = false
+			item.IsOrder = 0
 			item.EdbInfoType = v.EdbInfoType
 			item.EdbInfoCategoryType = v.EdbInfoType
 			item.ChartStyle = ""

+ 7 - 2
controllers/data_manage/future_good/future_good_chart_info.go

@@ -360,6 +360,11 @@ func (this *FutureGoodChartInfoController) ChartInfoAdd() {
 		br.Msg = "分类参数错误!"
 		return
 	}
+	for _, v := range req.ChartEdbInfoList {
+		if v.IsOrderBool {
+			v.IsOrder = 1
+		}
+	}
 
 	chartClassify, err := data_manage.GetChartClassifyById(req.ChartClassifyId)
 	if err != nil {
@@ -544,7 +549,7 @@ func (this *FutureGoodChartInfoController) ChartInfoAdd() {
 		mapItem.UniqueCode = utils.MD5(utils.CHART_PREFIX + "_" + timestamp + "_" + strconv.Itoa(v.EdbInfoId))
 		//mapItem.MaxData = v.MaxData
 		//mapItem.MinData = v.MinData
-		mapItem.IsOrder = true
+		mapItem.IsOrder = 1
 		mapItem.IsAxis = 1
 		mapItem.EdbInfoType = 1
 		//mapItem.LeadValue = v.LeadValue
@@ -2123,7 +2128,7 @@ func (this *FutureGoodChartInfoController) ChartInfoEdbInfoDetail() {
 	mapping.ChartInfoId = 0
 	mapping.MaxData = maxData
 	mapping.MinData = minData
-	mapping.IsOrder = false
+	mapping.IsOrder = 0
 	mapping.IsAxis = 1
 	mapping.EdbInfoType = 1
 	mapping.LeadValue = 0

+ 4 - 4
controllers/data_manage/future_good/future_good_profit_chart_info.go

@@ -256,7 +256,7 @@ func (this *FutureGoodChartInfoController) ProfitChartInfoAdd() {
 				UniqueCode:        utils.MD5(utils.CHART_PREFIX + "_" + strconv.FormatInt(time.Now().UnixNano(), 10) + "_" + strconv.Itoa(v.EdbInfoId)),
 				//MaxData:           0,
 				//MinData:           0,
-				IsOrder:     true,
+				IsOrder:     1,
 				IsAxis:      1,
 				EdbInfoType: 1,
 				//LeadValue:         0,
@@ -278,7 +278,7 @@ func (this *FutureGoodChartInfoController) ProfitChartInfoAdd() {
 				UniqueCode:        utils.MD5(utils.CHART_PREFIX + "_" + strconv.FormatInt(time.Now().UnixNano(), 10) + "_" + strconv.Itoa(v.FutureGoodEdbInfoId)),
 				//MaxData:           0,
 				//MinData:           0,
-				IsOrder:     true,
+				IsOrder:     1,
 				IsAxis:      1,
 				EdbInfoType: 1,
 				//LeadValue:         0,
@@ -585,7 +585,7 @@ func (this *FutureGoodChartInfoController) ProfitChartInfoEdit() {
 				UniqueCode:        utils.MD5(utils.CHART_PREFIX + "_" + strconv.FormatInt(time.Now().UnixNano(), 10) + "_" + strconv.Itoa(v.EdbInfoId)),
 				//MaxData:           0,
 				//MinData:           0,
-				IsOrder:     true,
+				IsOrder:     1,
 				IsAxis:      1,
 				EdbInfoType: 1,
 				//LeadValue:         0,
@@ -606,7 +606,7 @@ func (this *FutureGoodChartInfoController) ProfitChartInfoEdit() {
 				UniqueCode:        utils.MD5(utils.CHART_PREFIX + "_" + strconv.FormatInt(time.Now().UnixNano(), 10) + "_" + strconv.Itoa(v.FutureGoodEdbInfoId)),
 				//MaxData:           0,
 				//MinData:           0,
-				IsOrder:     true,
+				IsOrder:     1,
 				IsAxis:      1,
 				EdbInfoType: 1,
 				//LeadValue:         0,

+ 8 - 8
controllers/data_manage/line_feature/chart_info.go

@@ -198,7 +198,7 @@ func (this *LineFeaturesChartInfoController) MultipleGraphPreview() {
 			}
 
 			chartEdbInfoMapping := *v
-			chartEdbInfoMapping.IsOrder = false
+			chartEdbInfoMapping.IsOrder = 0
 			chartEdbInfoMapping.IsAxis = 1
 			chartEdbInfoMapping.MinData = curveConf.LeftMin
 			chartEdbInfoMapping.MaxData = curveConf.LeftMax
@@ -249,7 +249,7 @@ func (this *LineFeaturesChartInfoController) MultipleGraphPreview() {
 				}
 
 				chartEdbInfoMapping := *v
-				chartEdbInfoMapping.IsOrder = false
+				chartEdbInfoMapping.IsOrder = 0
 				chartEdbInfoMapping.IsAxis = 1
 				//chartEdbInfoMapping.MinData = curveConf.LeftMin
 				//chartEdbInfoMapping.MaxData = curveConf.LeftMax
@@ -301,7 +301,7 @@ func (this *LineFeaturesChartInfoController) MultipleGraphPreview() {
 					}
 
 					chartEdbInfoMapping := *v
-					chartEdbInfoMapping.IsOrder = false
+					chartEdbInfoMapping.IsOrder = 0
 					chartEdbInfoMapping.IsAxis = 1
 					//chartEdbInfoMapping.MinData = curveConf.LeftMin
 					//chartEdbInfoMapping.MaxData = curveConf.LeftMax
@@ -351,7 +351,7 @@ func (this *LineFeaturesChartInfoController) MultipleGraphPreview() {
 					}
 
 					chartEdbInfoMapping := *v
-					chartEdbInfoMapping.IsOrder = false
+					chartEdbInfoMapping.IsOrder = 0
 					chartEdbInfoMapping.IsAxis = 1
 					//chartEdbInfoMapping.MinData = curveConf.LeftMin
 					//chartEdbInfoMapping.MaxData = curveConf.LeftMax
@@ -461,7 +461,7 @@ func (this *LineFeaturesChartInfoController) MultipleGraphPreviewCurve() {
 			}
 
 			chartEdbInfoMapping := *v
-			chartEdbInfoMapping.IsOrder = false
+			chartEdbInfoMapping.IsOrder = 0
 			chartEdbInfoMapping.IsAxis = 1
 			chartEdbInfoMapping.MinData = curveConf.LeftMin
 			chartEdbInfoMapping.MaxData = curveConf.LeftMax
@@ -599,7 +599,7 @@ func (this *LineFeaturesChartInfoController) MultipleGraphConfigSaveChart() {
 				EdbInfoId:   edbInfoMapping.EdbInfoId,
 				MaxData:     curveConf.LeftMax,
 				MinData:     curveConf.LeftMin,
-				IsOrder:     false,
+				IsOrder:     0,
 				IsAxis:      1,
 				EdbInfoType: 1,
 				//LeadValue:         curveConf.LeadValue,
@@ -897,7 +897,7 @@ func CopyMultipleGraphConfigSaveChart(req request.SaveMultipleGraphChartReq, thi
 				EdbInfoId:   edbInfoMapping.EdbInfoId,
 				MaxData:     curveConf.LeftMax,
 				MinData:     curveConf.LeftMin,
-				IsOrder:     false,
+				IsOrder:     0,
 				IsAxis:      1,
 				EdbInfoType: 1,
 				//LeadValue:         curveConf.LeadValue,
@@ -1906,7 +1906,7 @@ func (this *LineFeaturesChartInfoController) Detail() {
 		}
 
 		chartEdbInfoMapping := *v
-		chartEdbInfoMapping.IsOrder = false
+		chartEdbInfoMapping.IsOrder = 0
 		chartEdbInfoMapping.IsAxis = 1
 		//chartEdbInfoMapping.MinData = curveConf.LeftMin
 		//chartEdbInfoMapping.MaxData = curveConf.LeftMax

+ 29 - 12
controllers/data_manage/multiple_graph_config.go

@@ -231,14 +231,18 @@ func (this *ChartInfoController) MultipleGraphPreview() {
 			edbInfoType = 1
 		}
 
+		isOrder := 0
+		if curveConf.IsOrder {
+			isOrder = 1
+		}
 		for _, v := range mappingList {
 			v.EdbInfoType = 1
-			v.IsOrder = false
+			v.IsOrder = 0
 			if v.EdbInfoId == req.EdbInfoIdB {
 				v.LeadValue = curveConf.LeadValue
 				v.LeadUnit = curveConf.LeadUnit
 				v.EdbInfoType = edbInfoType
-				v.IsOrder = curveConf.IsOrder
+				v.IsOrder = isOrder
 			}
 		}
 
@@ -262,7 +266,7 @@ func (this *ChartInfoController) MultipleGraphPreview() {
 			}
 
 			chartEdbInfoMapping := *v
-			chartEdbInfoMapping.IsOrder = false
+			chartEdbInfoMapping.IsOrder = 0
 
 			if v.EdbInfoId == req.EdbInfoIdA {
 				chartEdbInfoMapping.IsAxis = 1
@@ -281,7 +285,7 @@ func (this *ChartInfoController) MultipleGraphPreview() {
 				chartEdbInfoMapping.LeadValue = curveConf.LeadValue
 				chartEdbInfoMapping.LeadUnit = curveConf.LeadUnit
 				chartEdbInfoMapping.ChartWidth = 1
-				chartEdbInfoMapping.IsOrder = curveConf.IsOrder
+				chartEdbInfoMapping.IsOrder = isOrder
 				chartEdbInfoMapping.EdbInfoType = edbInfoType
 			}
 
@@ -523,14 +527,18 @@ func (this *ChartInfoController) MultipleGraphPreviewCurve() {
 		if curveConf.EdbInfoType {
 			edbInfoType = 1
 		}
+		isOrder := 0
+		if curveConf.IsOrder {
+			isOrder = 1
+		}
 		for _, v := range mappingList {
 			v.EdbInfoType = 1
-			v.IsOrder = false
+			v.IsOrder = 0
 			if v.EdbInfoId == req.EdbInfoIdB {
 				v.LeadValue = curveConf.LeadValue
 				v.LeadUnit = curveConf.LeadUnit
 				v.EdbInfoType = edbInfoType
-				v.IsOrder = curveConf.IsOrder
+				v.IsOrder = isOrder
 			}
 		}
 
@@ -553,7 +561,7 @@ func (this *ChartInfoController) MultipleGraphPreviewCurve() {
 			}
 
 			chartEdbInfoMapping := *v
-			chartEdbInfoMapping.IsOrder = false
+			chartEdbInfoMapping.IsOrder = 0
 			chartEdbInfoMapping.EdbInfoType = 1
 
 			if v.EdbInfoId == req.EdbInfoIdA {
@@ -572,7 +580,7 @@ func (this *ChartInfoController) MultipleGraphPreviewCurve() {
 				chartEdbInfoMapping.LeadValue = curveConf.LeadValue
 				chartEdbInfoMapping.LeadUnit = curveConf.LeadUnit
 				chartEdbInfoMapping.ChartWidth = 1
-				chartEdbInfoMapping.IsOrder = curveConf.IsOrder
+				chartEdbInfoMapping.IsOrder = isOrder
 				chartEdbInfoMapping.EdbInfoType = edbInfoType
 			}
 
@@ -713,12 +721,17 @@ func (this *ChartInfoController) MultipleGraphConfigSaveChart() {
 			edbInfoType = 0
 		}
 
+		var isOrder int
+		if curveConf.IsOrder {
+			isOrder = 1
+		}
+
 		chartSaveItemList := []*data_manage.ChartSaveItem{
 			{
 				EdbInfoId:   edbInfoMappingA.EdbInfoId,
 				MaxData:     curveConf.LeftMax,
 				MinData:     curveConf.LeftMin,
-				IsOrder:     false,
+				IsOrder:     0,
 				IsAxis:      1,
 				EdbInfoType: 1,
 				//LeadValue:         curveConf.LeadValue,
@@ -732,7 +745,7 @@ func (this *ChartInfoController) MultipleGraphConfigSaveChart() {
 				EdbInfoId:         edbInfoMappingB.EdbInfoId,
 				MaxData:           curveConf.RightMax,
 				MinData:           curveConf.RightMin,
-				IsOrder:           curveConf.IsOrder,
+				IsOrder:           isOrder,
 				IsAxis:            0,
 				EdbInfoType:       edbInfoType,
 				LeadValue:         curveConf.LeadValue,
@@ -1047,12 +1060,16 @@ func CopyMultipleGraphConfigSaveChart(req request.SaveMultipleGraphChartReq, thi
 		if !curveConf.EdbInfoType {
 			edbInfoType = 0
 		}
+		var isOrder int
+		if curveConf.IsOrder {
+			isOrder = 1
+		}
 		chartSaveItemList := []*data_manage.ChartSaveItem{
 			{
 				EdbInfoId:   edbInfoMappingA.EdbInfoId,
 				MaxData:     curveConf.LeftMax,
 				MinData:     curveConf.LeftMin,
-				IsOrder:     false,
+				IsOrder:     0,
 				IsAxis:      1,
 				EdbInfoType: 1,
 				//LeadValue:         curveConf.LeadValue,
@@ -1066,7 +1083,7 @@ func CopyMultipleGraphConfigSaveChart(req request.SaveMultipleGraphChartReq, thi
 				EdbInfoId:         edbInfoMappingB.EdbInfoId,
 				MaxData:           curveConf.RightMax,
 				MinData:           curveConf.RightMin,
-				IsOrder:           curveConf.IsOrder,
+				IsOrder:           isOrder,
 				IsAxis:            0,
 				EdbInfoType:       edbInfoType,
 				LeadValue:         curveConf.LeadValue,

+ 1 - 1
models/data_manage/chart_edb_mapping.go

@@ -19,7 +19,7 @@ type ChartEdbMapping struct {
 	UniqueCode        string    `description:"唯一编码"`
 	MaxData           float64   `description:"上限"`
 	MinData           float64   `description:"下限"`
-	IsOrder           bool      `description:"true:正序,false:逆序"`
+	IsOrder           int       `description:"1:正序,0:逆序"`
 	IsAxis            int       `description:"true:左轴,false:右轴"`
 	EdbInfoType       int       `description:"true:标准指标,false:领先指标"`
 	LeadValue         int       `description:"领先值"`

+ 5 - 4
models/data_manage/chart_info.go

@@ -218,7 +218,8 @@ type ChartSaveItem struct {
 	EdbInfoId         int     `description:"指标id"`
 	MaxData           float64 `description:"上限"`
 	MinData           float64 `description:"下限"`
-	IsOrder           bool    `description:"true:正序,false:逆序"`
+	IsOrder           int     `description:"1:正序,0:逆序" json:"IsOrderBak"`
+	IsOrderBool       bool    `description:"1:正序,0:逆序" json:"IsOrder"`
 	IsAxis            int     `description:"1:左轴,0:右轴"`
 	EdbInfoType       int     `description:"1:标准指标,0:领先指标"`
 	LeadValue         int     `description:"领先值"`
@@ -782,7 +783,7 @@ type ChartEdbInfoMapping struct {
 	ChartInfoId         int     `description:"图表id"`
 	MaxData             float64 `description:"上限"`
 	MinData             float64 `description:"下限"`
-	IsOrder             bool    `description:"true:正序,false:逆序"`
+	IsOrder             int     `description:"1:正序,0:逆序"`
 	IsAxis              int     `description:"1:左轴,0:右轴"`
 	EdbInfoType         int     `description:"1:标准指标,0:领先指标"`
 	EdbInfoCategoryType int     `description:"0:普通指标,1:预测指标"`
@@ -1371,7 +1372,7 @@ func EditFutureGoodChartInfoAndMapping(req *EditFutureGoodChartInfoReq, edbInfoI
 			mapItem.UniqueCode = utils.MD5(utils.CHART_PREFIX + "_" + timestamp + "_" + strconv.Itoa(v.EdbInfoId))
 			//mapItem.MaxData = v.MaxData
 			//mapItem.MinData = v.MinData
-			mapItem.IsOrder = true
+			mapItem.IsOrder = 1
 			mapItem.IsAxis = 1
 			mapItem.EdbInfoType = 1
 			//mapItem.LeadValue = v.LeadValue
@@ -2514,7 +2515,7 @@ func EditCorrelationChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr stri
 			mapItem.UniqueCode = utils.MD5(utils.CHART_PREFIX + "_" + timestamp + "_" + strconv.Itoa(v.EdbInfoId))
 			//mapItem.MaxData = v.MaxData
 			//mapItem.MinData = v.MinData
-			mapItem.IsOrder = true
+			mapItem.IsOrder = 1
 			mapItem.IsAxis = 1
 			mapItem.EdbInfoType = 1
 			//mapItem.LeadValue = v.LeadValue

+ 1 - 1
models/data_manage/chart_orm.go

@@ -198,7 +198,7 @@ type ChartEdbInfoMappingOrm struct {
 	ChartInfoId         int       `description:"图表id"`
 	MaxData             float64   `description:"上限"`
 	MinData             float64   `description:"下限"`
-	IsOrder             bool      `description:"true:正序,false:逆序"`
+	IsOrder             int       `description:"1:正序,0:逆序"`
 	IsAxis              int       `description:"1:左轴,0:右轴"`
 	EdbInfoType         int       `description:"1:标准指标,0:领先指标"`
 	EdbInfoCategoryType int       `description:"0:普通指标,1:预测指标"`

+ 1 - 1
models/data_manage/excel/excel_chart_edb.go

@@ -25,7 +25,7 @@ type ExcelChartEdb struct {
 	SysUserRealName string    `description:"创建人姓名"`
 	MaxData         float64   `description:"上限"`
 	MinData         float64   `description:"下限"`
-	IsOrder         bool      `description:"true:正序,false:逆序"`
+	IsOrder         int       `description:"1:正序,0:逆序"`
 	IsAxis          int       `description:"true:左轴,false:右轴"`
 	EdbInfoType     int       `description:"true:标准指标,false:领先指标"`
 	LeadValue       int       `description:"领先值"`

+ 1 - 1
models/data_manage/excel/request/balance_table.go

@@ -9,7 +9,7 @@ type AddBalanceTableChartEdbItem struct {
 	Unit            string  `description:"指标单位"`
 	MaxData         float64 `description:"上限"`
 	MinData         float64 `description:"下限"`
-	IsOrder         bool    `description:"true:正序,false:逆序"`
+	IsOrder         int     `description:"1:正序,0:逆序"`
 	IsAxis          int     `description:"true:左轴,false:右轴"`
 	EdbInfoType     int     `description:"true:标准指标,false:领先指标"`
 	LeadValue       int     `description:"领先值"`

+ 1 - 1
models/data_manage/future_good/chart_info_future_good_profit.go

@@ -180,7 +180,7 @@ func EditFutureGoodChartInfoAndMapping(chartInfo *data_manage.ChartInfo, newEdbM
 			mapItem.ModifyTime = time.Now()
 			timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
 			mapItem.UniqueCode = utils.MD5(utils.CHART_PREFIX + "_" + timestamp + "_" + strconv.Itoa(v.EdbInfoId))
-			mapItem.IsOrder = true
+			mapItem.IsOrder = 1
 			mapItem.IsAxis = 1
 			mapItem.EdbInfoType = 1
 			mapItem.Source = v.Source

+ 1 - 1
models/data_manage/line_feature/line_feature.go

@@ -163,7 +163,7 @@ func EditLineFeatureChartAndMapping(req *data_manage.EditChartInfoReq, edbInfoId
 			mapItem.UniqueCode = utils.MD5(utils.CHART_PREFIX + "_" + timestamp + "_" + strconv.Itoa(v.EdbInfoId))
 			//mapItem.MaxData = v.MaxData
 			//mapItem.MinData = v.MinData
-			mapItem.IsOrder = true
+			mapItem.IsOrder = 1
 			mapItem.IsAxis = 1
 			mapItem.EdbInfoType = 1
 			//mapItem.LeadValue = v.LeadValue

+ 5 - 5
services/data/chart_info.go

@@ -648,7 +648,7 @@ func getEdbDataMapList(chartInfoId, chartType int, calendar, startDate, endDate
 			item.LeadUnit = ""
 			item.ChartEdbMappingId = 0
 			item.ChartInfoId = 0
-			item.IsOrder = false
+			item.IsOrder = 0
 			item.EdbInfoType = 1
 			item.ChartStyle = ""
 			item.ChartColor = ""
@@ -2416,7 +2416,7 @@ func AddChartInfo(req data_manage.AddChartInfoReq, sysUserId int, sysUserRealNam
 					EdbInfoId:         v.EdbInfoId,
 					MaxData:           0,
 					MinData:           0,
-					IsOrder:           false,
+					IsOrder:           0,
 					IsAxis:            1,
 					EdbInfoType:       1,
 					LeadValue:         0,
@@ -2813,7 +2813,7 @@ func EditChartInfo(req data_manage.EditChartInfoReq, sysUser *system.Admin, lang
 					EdbInfoId:         v.EdbInfoId,
 					MaxData:           0,
 					MinData:           0,
-					IsOrder:           false,
+					IsOrder:           0,
 					IsAxis:            1,
 					EdbInfoType:       1,
 					LeadValue:         0,
@@ -3323,7 +3323,7 @@ func getEdbConvertDataMapList(chartInfoId, chartType int, calendar, startDate, e
 			item.LeadUnit = ""
 			item.ChartEdbMappingId = 0
 			item.ChartInfoId = 0
-			item.IsOrder = false
+			item.IsOrder = 0
 			item.EdbInfoType = 1
 			item.ChartStyle = ""
 			item.ChartColor = ""
@@ -5018,7 +5018,7 @@ func getEdbDataMapListForSeason(chartInfoId, chartType int, calendar, startDate,
 			item.LeadUnit = ""
 			item.ChartEdbMappingId = 0
 			item.ChartInfoId = 0
-			item.IsOrder = false
+			item.IsOrder = 0
 			item.EdbInfoType = 1
 			item.ChartStyle = ""
 			item.ChartColor = ""

+ 1 - 1
services/data/chart_info_excel_balance.go

@@ -800,7 +800,7 @@ func GetBalanceExcelEdbDataMapList(chartInfoId, chartType int, calendar, startDa
 			item.LeadUnit = ""
 			item.ChartEdbMappingId = 0
 			item.ChartInfoId = 0
-			item.IsOrder = false
+			item.IsOrder = 0
 			item.EdbInfoType = 1
 			item.ChartStyle = ""
 			item.ChartColor = ""

+ 1 - 1
services/data/chart_theme.go

@@ -219,7 +219,7 @@ func getThemePreviewEdbDataMapList(chartType int, calendar, startDate, endDate s
 		item.ChartStyle = v.ChartStyle
 		item.ChartColor = v.ChartColor
 		item.ChartWidth = 0
-		item.IsOrder = false
+		item.IsOrder = 0
 		item.MaxData = v.MaxValue
 		item.MinData = v.MinValue
 		item.LatestValue = v.LatestValue

+ 3 - 3
services/data/correlation/chart_info.go

@@ -176,7 +176,7 @@ func GetChartEdbInfoFormat(chartInfoId int, edbInfoMappingA, edbInfoMappingB *da
 		edbInfoMappingA.LeadUnit = ""
 		edbInfoMappingA.ChartEdbMappingId = 0
 		edbInfoMappingA.ChartInfoId = 0
-		edbInfoMappingA.IsOrder = false
+		edbInfoMappingA.IsOrder = 0
 		edbInfoMappingA.EdbInfoType = 1
 		edbInfoMappingA.ChartStyle = ""
 		edbInfoMappingA.ChartColor = ""
@@ -187,7 +187,7 @@ func GetChartEdbInfoFormat(chartInfoId int, edbInfoMappingA, edbInfoMappingB *da
 		edbInfoMappingB.LeadUnit = ""
 		edbInfoMappingB.ChartEdbMappingId = 0
 		edbInfoMappingB.ChartInfoId = 0
-		edbInfoMappingB.IsOrder = false
+		edbInfoMappingB.IsOrder = 0
 		edbInfoMappingB.EdbInfoType = 1
 		edbInfoMappingB.ChartStyle = ""
 		edbInfoMappingB.ChartColor = ""
@@ -901,7 +901,7 @@ func AddChartInfo(req data_manage.AddChartInfoReq, source int, sysUser *system.A
 		mapItem.ModifyTime = time.Now()
 		edbTimestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
 		mapItem.UniqueCode = utils.MD5(utils.CHART_PREFIX + "_" + edbTimestamp + "_" + strconv.Itoa(v.EdbInfoId))
-		mapItem.IsOrder = true
+		mapItem.IsOrder = 1
 		mapItem.IsAxis = 1
 		mapItem.EdbInfoType = 1
 		mapItem.Source = utils.CHART_SOURCE_CORRELATION

+ 2 - 2
services/data/future_good/chart_info.go

@@ -48,7 +48,7 @@ func GetChartEdbData(chartInfoId int, startDate, endDate string, baseEdbInfoMapp
 			edbInfoMapping.LeadUnit = ""
 			edbInfoMapping.ChartEdbMappingId = 0
 			edbInfoMapping.ChartInfoId = 0
-			edbInfoMapping.IsOrder = false
+			edbInfoMapping.IsOrder = 0
 			edbInfoMapping.EdbInfoType = 1
 			edbInfoMapping.ChartStyle = ""
 			edbInfoMapping.ChartColor = ""
@@ -60,7 +60,7 @@ func GetChartEdbData(chartInfoId int, startDate, endDate string, baseEdbInfoMapp
 		futureGoodEdbInfoMapping.LeadUnit = ""
 		futureGoodEdbInfoMapping.ChartEdbMappingId = 0
 		futureGoodEdbInfoMapping.ChartInfoId = 0
-		futureGoodEdbInfoMapping.IsOrder = false
+		futureGoodEdbInfoMapping.IsOrder = 0
 		futureGoodEdbInfoMapping.EdbInfoType = 1
 		futureGoodEdbInfoMapping.ChartStyle = ""
 		futureGoodEdbInfoMapping.ChartColor = ""

+ 2 - 2
services/data/line_equation/chart_info.go

@@ -523,7 +523,7 @@ func BatchAddChartInfo(batchAddChartReq []request.AddChart, lineChartInfoConfig
 			timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
 
 			mapItem.UniqueCode = utils.MD5(utils.CHART_PREFIX + "_" + fmt.Sprint(v.Source) + "_" + timestamp + "_" + strconv.Itoa(edbInfo.EdbInfoId))
-			mapItem.IsOrder = true
+			mapItem.IsOrder = 1
 			mapItem.IsAxis = 1
 			mapItem.EdbInfoType = 1
 			mapItem.Source = source
@@ -775,7 +775,7 @@ func BatchSaveChartInfo(multipleGraphConfigId int, batchAddChartReq []request.Ad
 			timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
 
 			mapItem.UniqueCode = utils.MD5(utils.CHART_PREFIX + "_" + fmt.Sprint(v.Source) + "_" + timestamp + "_" + strconv.Itoa(edbInfo.EdbInfoId))
-			mapItem.IsOrder = true
+			mapItem.IsOrder = 1
 			mapItem.IsAxis = 1
 			mapItem.EdbInfoType = 1
 			mapItem.Source = source

+ 1 - 1
services/data/line_feature/chart_info.go

@@ -518,7 +518,7 @@ func AddChartInfo(req data_manage.AddChartInfoReq, edbInfoMapping *data_manage.C
 		mapItem.CreateTime = time.Now()
 		mapItem.ModifyTime = time.Now()
 		mapItem.UniqueCode = utils.MD5(utils.CHART_PREFIX + "_" + strconv.FormatInt(time.Now().UnixNano(), 10) + "_" + strconv.Itoa(edbInfoMapping.EdbInfoId))
-		mapItem.IsOrder = true
+		mapItem.IsOrder = 1
 		mapItem.IsAxis = 1
 		mapItem.EdbInfoType = 1
 		mapItem.Source = utils.CHART_SOURCE_CORRELATION

+ 2 - 2
services/data/range_analysis/chart_info.go

@@ -391,7 +391,7 @@ func GetChartEdbInfoFormat(chartInfoId int, edbInfoMappingList []*data_manage.Ch
 			edbInfoMapping.LeadUnit = ""
 			edbInfoMapping.ChartEdbMappingId = 0
 			edbInfoMapping.ChartInfoId = 0
-			edbInfoMapping.IsOrder = false
+			edbInfoMapping.IsOrder = 0
 			edbInfoMapping.EdbInfoType = 1
 			edbInfoMapping.ChartStyle = ""
 			edbInfoMapping.ChartColor = ""
@@ -1179,7 +1179,7 @@ func AddChartInfo(req data_manage.AddChartInfoReq, source int, sysUser *system.A
 		mapItem.ModifyTime = time.Now()
 		edbTimestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
 		mapItem.UniqueCode = utils.MD5(utils.CHART_PREFIX + "_" + edbTimestamp + "_" + strconv.Itoa(v.EdbInfoId))
-		mapItem.IsOrder = false
+		mapItem.IsOrder = 0
 		mapItem.EdbInfoType = 1
 		mapItem.Source = utils.CHART_SOURCE_RANGE_ANALYSIS
 		mapList = append(mapList, mapItem)