fix

controllers/data_manage/base_from_rzd_index_controller.go

@@ -574,8 +574,7 @@ func (this *BaseFromRzdIndexController) RzdIndexDataExport() {
 			celUnit := rowUnit.AddCell()
 			celUnit.SetValue(v.Unit)
 			rowModifyCell := rowModifyDate.AddCell()
-			updateTimeStr := utils.FormatDateString(v.ModifyTime)
-			rowModifyCell.SetValue(updateTimeStr)
+			rowModifyCell.SetValue(v.ModifyTime.Format(utils.FormatDateTime))
 			tradeCodeList = append(tradeCodeList, v.IndexCode)
 
 			var dataList []*data_manage.BaseFromRzdData

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 = 0
+	mapping.IsOrder = false
 	mapping.IsAxis = 1
 	mapping.EdbInfoType = 1
 	mapping.LeadValue = 0
@@ -3217,6 +3217,10 @@ func (this *ChartInfoController) CopyChartInfo() {
 	{
 		mapList := make([]*data_manage.ChartEdbMapping, 0)
 		for _, v := range edbMappingList {
+			isOder := 0
+			if v.IsOrder {
+				isOder = 1
+			}
 			timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
 			mapItem := &data_manage.ChartEdbMapping{
 				//ChartEdbMappingId: 0,
@@ -3227,7 +3231,7 @@ func (this *ChartInfoController) CopyChartInfo() {
 				UniqueCode:    utils.MD5(utils.CHART_PREFIX + "_" + timestamp),
 				MaxData:       v.MaxData,
 				MinData:       v.MinData,
-				IsOrder:       v.IsOrder,
+				IsOrder:       isOder,
 				IsAxis:        v.IsAxis,
 				EdbInfoType:   v.EdbInfoType,
 				LeadValue:     v.LeadValue,

controllers/data_manage/edb_info.go

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

controllers/data_manage/future_good/future_good_chart_info.go

@@ -360,11 +360,6 @@ 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 {
@@ -2128,7 +2123,7 @@ func (this *FutureGoodChartInfoController) ChartInfoEdbInfoDetail() {
 	mapping.ChartInfoId = 0
 	mapping.MaxData = maxData
 	mapping.MinData = minData
-	mapping.IsOrder = 0
+	mapping.IsOrder = false
 	mapping.IsAxis = 1
 	mapping.EdbInfoType = 1
 	mapping.LeadValue = 0
@@ -3004,7 +2999,7 @@ func copyChartInfo(oldChartInfo *data_manage.ChartInfo, chartClassifyId int, cha
 				UniqueCode:  utils.MD5(utils.CHART_PREFIX + "_" + strconv.Itoa(v.EdbInfoId) + timestamp),
 				MaxData:     v.MaxData,
 				MinData:     v.MinData,
-				IsOrder:     v.IsOrder,
+				IsOrder:     utils.GetChartEdbIsOrder(v.IsOrder),
 				IsAxis:      v.IsAxis,
 				EdbInfoType: v.EdbInfoType,
 				LeadValue:   v.LeadValue,

controllers/data_manage/future_good/future_good_profit_chart_info.go

@@ -813,7 +813,7 @@ func copyProfitChartInfo(oldChartInfo *data_manage.ChartInfo, chartClassifyId in
 				UniqueCode:  utils.MD5(utils.CHART_PREFIX + "_" + strconv.Itoa(v.EdbInfoId) + strconv.FormatInt(time.Now().UnixNano(), 10)),
 				MaxData:     v.MaxData,
 				MinData:     v.MinData,
-				IsOrder:     v.IsOrder,
+				IsOrder:     utils.GetChartEdbIsOrder(v.IsOrder),
 				IsAxis:      v.IsAxis,
 				EdbInfoType: v.EdbInfoType,
 				LeadValue:   v.LeadValue,

controllers/data_manage/line_feature/chart_info.go

@@ -198,7 +198,7 @@ func (this *LineFeaturesChartInfoController) MultipleGraphPreview() {
 			}
 
 			chartEdbInfoMapping := *v
-			chartEdbInfoMapping.IsOrder = 0
+			chartEdbInfoMapping.IsOrder = false
 			chartEdbInfoMapping.IsAxis = 1
 			chartEdbInfoMapping.MinData = curveConf.LeftMin
 			chartEdbInfoMapping.MaxData = curveConf.LeftMax
@@ -249,7 +249,7 @@ func (this *LineFeaturesChartInfoController) MultipleGraphPreview() {
 				}
 
 				chartEdbInfoMapping := *v
-				chartEdbInfoMapping.IsOrder = 0
+				chartEdbInfoMapping.IsOrder = false
 				chartEdbInfoMapping.IsAxis = 1
 				//chartEdbInfoMapping.MinData = curveConf.LeftMin
 				//chartEdbInfoMapping.MaxData = curveConf.LeftMax
@@ -301,7 +301,7 @@ func (this *LineFeaturesChartInfoController) MultipleGraphPreview() {
 					}
 
 					chartEdbInfoMapping := *v
-					chartEdbInfoMapping.IsOrder = 0
+					chartEdbInfoMapping.IsOrder = false
 					chartEdbInfoMapping.IsAxis = 1
 					//chartEdbInfoMapping.MinData = curveConf.LeftMin
 					//chartEdbInfoMapping.MaxData = curveConf.LeftMax
@@ -351,7 +351,7 @@ func (this *LineFeaturesChartInfoController) MultipleGraphPreview() {
 					}
 
 					chartEdbInfoMapping := *v
-					chartEdbInfoMapping.IsOrder = 0
+					chartEdbInfoMapping.IsOrder = false
 					chartEdbInfoMapping.IsAxis = 1
 					//chartEdbInfoMapping.MinData = curveConf.LeftMin
 					//chartEdbInfoMapping.MaxData = curveConf.LeftMax
@@ -461,7 +461,7 @@ func (this *LineFeaturesChartInfoController) MultipleGraphPreviewCurve() {
 			}
 
 			chartEdbInfoMapping := *v
-			chartEdbInfoMapping.IsOrder = 0
+			chartEdbInfoMapping.IsOrder = false
 			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:     0,
+				IsOrder:     false,
 				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:     0,
+				IsOrder:     false,
 				IsAxis:      1,
 				EdbInfoType: 1,
 				//LeadValue:         curveConf.LeadValue,
@@ -1906,7 +1906,7 @@ func (this *LineFeaturesChartInfoController) Detail() {
 		}
 
 		chartEdbInfoMapping := *v
-		chartEdbInfoMapping.IsOrder = 0
+		chartEdbInfoMapping.IsOrder = false
 		chartEdbInfoMapping.IsAxis = 1
 		//chartEdbInfoMapping.MinData = curveConf.LeftMin
 		//chartEdbInfoMapping.MaxData = curveConf.LeftMax

controllers/data_manage/multiple_graph_config.go

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

models/data_manage/base_from_clarksons_index.go

@@ -22,6 +22,21 @@ type BaseFromClarksonsIndex struct {
 	ModifyTime               time.Time
 }
 
+func (m *BaseFromClarksonsIndex) ToIndexAndData() (item *BaseFromRzdIndexAndData) {
+	return &BaseFromRzdIndexAndData{
+		BaseFromRzdIndexId:    m.BaseFromClarksonsIndexId,
+		CreateTime:            m.CreateTime.Format(utils.FormatDateTime),
+		ModifyTime:            m.ModifyTime.Format(utils.FormatDateTime),
+		BaseFromRzdClassifyId: m.ClassifyId,
+		IndexCode:             m.IndexCode,
+		IndexName:             m.IndexName,
+		Frequency:             m.Frequency,
+		Unit:                  m.Unit,
+		//ModifyTimeMax:         "",
+		//Value:                 0,
+	}
+}
+
 type BaseFromClarksonsIndexOrm struct {
 	BaseFromClarksonsIndexId int       `orm:"pk"`
 	EdbInfoId                int       `description:"指标库id"`
@@ -457,12 +472,22 @@ func GetClarksonsIndexInfoCount(condition string, pars []interface{}) (count int
 
 // GetClarksonsIndexInfoPage 分页查询指标信息
 func GetClarksonsIndexInfoPage(condition string, pars []interface{}) (items []*BaseFromRzdIndexAndData, err error) {
+	var ormList []*BaseFromClarksonsIndex
+	items = make([]*BaseFromRzdIndexAndData, 0)
+
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT * FROM base_from_clarksons_index WHERE index_code not in (select edb_code from edb_info) `
 	if condition != "" {
 		sql += condition
 	}
-	_, err = o.Raw(sql, pars).QueryRows(&items)
+	_, err = o.Raw(sql, pars).QueryRows(&ormList)
+	if err != nil {
+		return
+	}
+	for _, ormItem := range ormList {
+		items = append(items, ormItem.ToIndexAndData())
+	}
+
 	return
 
 }

models/data_manage/base_from_rzd_index.go

@@ -7,17 +7,18 @@ import (
 	"fmt"
 	"github.com/beego/beego/v2/client/orm"
 	"github.com/rdlucklib/rdluck_tools/paging"
+	"time"
 )
 
 type BaseFromRzdIndex struct {
-	BaseFromRzdIndexId    int    `orm:"column(base_from_rzd_index_id);pk"`
-	CreateTime            string `orm:"column(create_time)"`
-	ModifyTime            string `orm:"column(modify_time)"`
-	BaseFromRzdClassifyId int    `orm:"column(base_from_rzd_classify_id)"`
-	IndexCode             string `orm:"column(index_code)"`
-	IndexName             string `orm:"column(index_name)"`
-	Frequency             string `orm:"column(frequency)"`
-	Unit                  string `orm:"column(unit)"`
+	BaseFromRzdIndexId    int       `orm:"column(base_from_rzd_index_id);pk"`
+	CreateTime            time.Time `orm:"column(create_time)"`
+	ModifyTime            time.Time `orm:"column(modify_time)"`
+	BaseFromRzdClassifyId int       `orm:"column(base_from_rzd_classify_id)"`
+	IndexCode             string    `orm:"column(index_code)"`
+	IndexName             string    `orm:"column(index_name)"`
+	Frequency             string    `orm:"column(frequency)"`
+	Unit                  string    `orm:"column(unit)"`
 }
 
 type BaseFromRzdIndexAndData struct {
@@ -33,6 +34,21 @@ type BaseFromRzdIndexAndData struct {
 	Value                 float64 `orm:"column(value)" description:"数据值"`
 }
 
+func (m *BaseFromRzdIndex) ToIndexAndData() (item *BaseFromRzdIndexAndData) {
+	return &BaseFromRzdIndexAndData{
+		BaseFromRzdIndexId:    m.BaseFromRzdIndexId,
+		CreateTime:            m.CreateTime.Format(utils.FormatDateTime),
+		ModifyTime:            m.ModifyTime.Format(utils.FormatDateTime),
+		BaseFromRzdClassifyId: m.BaseFromRzdClassifyId,
+		IndexCode:             m.IndexCode,
+		IndexName:             m.IndexName,
+		Frequency:             m.Frequency,
+		Unit:                  m.Unit,
+		//ModifyTimeMax:         "",
+		//Value:                 0,
+	}
+}
+
 type BaseFromRzdIndexPage struct {
 	List   []*BaseFromRzdIndexAndData `description:"指标列表"`
 	Paging *paging.PagingItem         `description:"分页数据"`

models/data_manage/chart_edb_mapping.go

@@ -39,7 +39,7 @@ type ChartEdbMapping struct {
 
 func AddChartEdbMapping(items []*ChartEdbMapping) (err error) {
 	o := orm.NewOrmUsingDB("data")
-	_, err = o.InsertMulti(1, items)
+	_, err = o.InsertMulti(utils.MultiAddNum, items)
 	return
 }
 
@@ -65,13 +65,17 @@ a.is_convert, a.convert_type, a.convert_value, a.convert_unit, a.convert_en_unit
 	return
 }
 
-func GetChartMappingList(chartInfoId int) (list []*ChartEdbMapping, err error) {
+func GetChartMappingList(chartInfoId int) (items []*ChartEdbMapping, err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := ` SELECT a.*
              FROM chart_edb_mapping AS a
 			 WHERE chart_info_id=? 
              ORDER BY chart_edb_mapping_id ASC `
-	_, err = o.Raw(sql, chartInfoId).QueryRows(&list)
+	_, err = o.Raw(sql, chartInfoId).QueryRows(&items)
+	if err != nil {
+		return
+	}
+
 	return
 }
 
@@ -501,3 +505,4 @@ func GetRelationEdbInfoListMappingByCondition(condition string, pars []interface
 
 	return
 }
+

models/data_manage/chart_info.go

@@ -218,8 +218,7 @@ type ChartSaveItem struct {
 	EdbInfoId         int     `description:"指标id"`
 	MaxData           float64 `description:"上限"`
 	MinData           float64 `description:"下限"`
-	IsOrder           int     `description:"1:正序,0:逆序" json:"IsOrderBak"`
-	IsOrderBool       bool    `description:"1:正序,0:逆序" json:"IsOrder"`
+	IsOrder           bool    `description:"true:正序,false:逆序"`
 	IsAxis            int     `description:"1:左轴,0:右轴"`
 	EdbInfoType       int     `description:"1:标准指标,0:领先指标"`
 	LeadValue         int     `description:"领先值"`
@@ -783,7 +782,7 @@ type ChartEdbInfoMapping struct {
 	ChartInfoId         int     `description:"图表id"`
 	MaxData             float64 `description:"上限"`
 	MinData             float64 `description:"下限"`
-	IsOrder             int     `description:"1:正序,0:逆序"`
+	IsOrder             bool    `description:"true:正序,false:逆序"`
 	IsAxis              int     `description:"1:左轴,0:右轴"`
 	EdbInfoType         int     `description:"1:标准指标,0:领先指标"`
 	EdbInfoCategoryType int     `description:"0:普通指标,1:预测指标"`
@@ -1007,7 +1006,7 @@ func ModifyChartInfoAndMapping(edbInfoIdStr string, req *SaveChartInfoReq, chart
 				 predict_chart_color = ?,
 				 chart_width = ?
 				WHERE chart_info_id =? AND edb_info_id=? `
-			_, err = to.Raw(msql, v.MaxData, v.MinData, v.IsOrder, v.IsAxis, v.EdbInfoType, v.LeadValue, v.LeadUnit, v.ChartStyle, v.ChartColor, v.PredictChartColor, v.ChartWidth, req.ChartInfoId, v.EdbInfoId).Exec()
+			_, err = to.Raw(msql, v.MaxData, v.MinData, utils.GetChartEdbIsOrder(v.IsOrder), v.IsAxis, v.EdbInfoType, v.LeadValue, v.LeadUnit, v.ChartStyle, v.ChartColor, v.PredictChartColor, v.ChartWidth, req.ChartInfoId, v.EdbInfoId).Exec()
 			if err != nil {
 				fmt.Println("chart_edb_mapping Err:" + err.Error())
 				return err
@@ -1022,7 +1021,7 @@ func ModifyChartInfoAndMapping(edbInfoIdStr string, req *SaveChartInfoReq, chart
 			mapItem.UniqueCode = utils.MD5(utils.CHART_PREFIX + "_" + timestamp)
 			mapItem.MaxData = v.MaxData
 			mapItem.MinData = v.MinData
-			mapItem.IsOrder = v.IsOrder
+			mapItem.IsOrder = utils.GetChartEdbIsOrder(v.IsOrder)
 			mapItem.IsAxis = v.IsAxis
 			mapItem.EdbInfoType = v.EdbInfoType
 			mapItem.LeadValue = v.LeadValue
@@ -1176,12 +1175,13 @@ func EditChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr string, calenda
 			fmt.Println("QueryRow Err:", err.Error())
 			return err
 		}
+
 		if tmpChartEdbMapping != nil {
 			chartEdbMappingIdList = append(chartEdbMappingIdList, strconv.Itoa(tmpChartEdbMapping.ChartEdbMappingId))
 			tmpChartEdbMapping.ModifyTime = time.Now()
 			tmpChartEdbMapping.MaxData = v.MaxData
 			tmpChartEdbMapping.MinData = v.MinData
-			tmpChartEdbMapping.IsOrder = v.IsOrder
+			tmpChartEdbMapping.IsOrder = utils.GetChartEdbIsOrder(v.IsOrder)
 			tmpChartEdbMapping.IsAxis = v.IsAxis
 			tmpChartEdbMapping.EdbInfoType = v.EdbInfoType
 			tmpChartEdbMapping.LeadValue = v.LeadValue
@@ -1212,7 +1212,7 @@ func EditChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr string, calenda
 			mapItem.UniqueCode = utils.MD5(utils.CHART_PREFIX + "_" + timestamp + "_" + strconv.Itoa(v.EdbInfoId))
 			mapItem.MaxData = v.MaxData
 			mapItem.MinData = v.MinData
-			mapItem.IsOrder = v.IsOrder
+			mapItem.IsOrder = utils.GetChartEdbIsOrder(v.IsOrder)
 			mapItem.IsAxis = v.IsAxis
 			mapItem.EdbInfoType = v.EdbInfoType
 			mapItem.LeadValue = v.LeadValue

models/data_manage/chart_orm.go

@@ -234,6 +234,10 @@ type ChartEdbInfoMappingOrm struct {
 }
 
 func (m *ChartEdbInfoMappingOrm) ToItem() (item *ChartEdbInfoMapping) {
+	var isOrder bool
+	if m.IsOrder == 1 {
+		isOrder = true
+	}
 	item = &ChartEdbInfoMapping{
 		EdbInfoId:           m.EdbInfoId,
 		SourceName:          m.SourceName,
@@ -256,7 +260,7 @@ func (m *ChartEdbInfoMappingOrm) ToItem() (item *ChartEdbInfoMapping) {
 		ChartInfoId:         m.ChartInfoId,
 		MaxData:             m.MaxData,
 		MinData:             m.MinData,
-		IsOrder:             m.IsOrder,
+		IsOrder:             isOrder,
 		IsAxis:              m.IsAxis,
 		EdbInfoType:         m.EdbInfoType,
 		EdbInfoCategoryType: m.EdbInfoCategoryType,

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 = 0
+			item.IsOrder = false
 			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:           0,
+					IsOrder:           false,
 					IsAxis:            1,
 					EdbInfoType:       1,
 					LeadValue:         0,
@@ -2598,7 +2598,7 @@ func AddChartInfo(req data_manage.AddChartInfoReq, sysUserId int, sysUserRealNam
 		mapItem.UniqueCode = utils.MD5(fmt.Sprint(utils.CHART_PREFIX, "_", v.EdbInfoId, "_", edbTimestamp))
 		mapItem.MaxData = v.MaxData
 		mapItem.MinData = v.MinData
-		mapItem.IsOrder = v.IsOrder
+		mapItem.IsOrder = utils.GetChartEdbIsOrder(v.IsOrder)
 		mapItem.IsAxis = v.IsAxis
 		mapItem.EdbInfoType = v.EdbInfoType
 		mapItem.LeadValue = v.LeadValue
@@ -2813,7 +2813,7 @@ func EditChartInfo(req data_manage.EditChartInfoReq, sysUser *system.Admin, lang
 					EdbInfoId:         v.EdbInfoId,
 					MaxData:           0,
 					MinData:           0,
-					IsOrder:           0,
+					IsOrder:           false,
 					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 = 0
+			item.IsOrder = false
 			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 = 0
+			item.IsOrder = false
 			item.EdbInfoType = 1
 			item.ChartStyle = ""
 			item.ChartColor = ""

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 = 0
+			item.IsOrder = false
 			item.EdbInfoType = 1
 			item.ChartStyle = ""
 			item.ChartColor = ""
@@ -1694,6 +1694,12 @@ func TransferChartEdbToEdbMappingFormat(chartInfoId, chartType int, mappingListT
 			utils.FileLog.Info(fmt.Sprintf("获取失败,指标数据异常 %d", v.ExcelChartEdbId))
 		}
 		startDateStr, endDateStr, _, endVal, maxValue, minValue := getBalanceDataListStartDateAndValue(dataList)
+
+		var isOrder bool
+		if v.IsOrder == 1 {
+			isOrder = true
+		}
+
 		mapping := &data_manage.ChartEdbInfoMapping{
 			EdbInfoId:         v.ExcelChartEdbId,
 			SourceName:        "平衡表",
@@ -1716,7 +1722,7 @@ func TransferChartEdbToEdbMappingFormat(chartInfoId, chartType int, mappingListT
 			ChartInfoId:       chartInfoId,
 			MaxData:           v.MaxData,
 			MinData:           v.MinData,
-			IsOrder:           v.IsOrder,
+			IsOrder:           isOrder,
 			IsAxis:            v.IsAxis,
 			EdbInfoType:       v.EdbInfoType,
 			//EdbInfoCategoryType: 0,

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 = 0
+		item.IsOrder = false
 		item.MaxData = v.MaxValue
 		item.MinData = v.MinValue
 		item.LatestValue = v.LatestValue

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 = 0
+		edbInfoMappingA.IsOrder = false
 		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 = 0
+		edbInfoMappingB.IsOrder = false
 		edbInfoMappingB.EdbInfoType = 1
 		edbInfoMappingB.ChartStyle = ""
 		edbInfoMappingB.ChartColor = ""

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 = 0
+			edbInfoMapping.IsOrder = false
 			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 = 0
+		futureGoodEdbInfoMapping.IsOrder = false
 		futureGoodEdbInfoMapping.EdbInfoType = 1
 		futureGoodEdbInfoMapping.ChartStyle = ""
 		futureGoodEdbInfoMapping.ChartColor = ""

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 = 0
+			edbInfoMapping.IsOrder = false
 			edbInfoMapping.EdbInfoType = 1
 			edbInfoMapping.ChartStyle = ""
 			edbInfoMapping.ChartColor = ""

utils/common.go

@@ -2897,3 +2897,11 @@ type Time struct {
 ////	dbTime.Time = times
 ////	return dbTime, err
 ////}
+
+func GetChartEdbIsOrder(isOrderBool bool) int {
+	if isOrderBool {
+		return 1
+	} else {
+		return 0
+	}
+}