图表搜索bug

models/data_manage/chart_info.go

@@ -72,7 +72,7 @@ type ChartInfoMore struct {
 
 func AddChartInfo(item *ChartInfo) (lastId int64, err error) {
 	o := global.DbMap[utils.DbNameIndex]
-    err = o.Create(item).Error
+	err = o.Create(item).Error
 	if err != nil {
 		return
 	}
@@ -209,7 +209,7 @@ type ChartSaveItem struct {
 
 func DeleteChartInfoAndData(chartInfoId int) (err error) {
 	o := global.DbMap[utils.DbNameIndex]
-	to := o.Begin() 
+	to := o.Begin()
 	if to.Error != nil {
 		return to.Error
 	}
@@ -237,7 +237,7 @@ func GetChartInfoCountByCondition(condition string, pars []interface{}) (count i
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).Scan(&count).Error
+	err = o.Raw(sql, pars...).Scan(&count).Error
 	return
 }
 
@@ -403,7 +403,7 @@ func GetChartInfoByCondition(condition string, pars []interface{}) (item *ChartI
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).First(&item).Error
+	err = o.Raw(sql, pars...).First(&item).Error
 	return
 }
 
@@ -493,6 +493,7 @@ func getEdbDataListByMysql(source, subSource, edbInfoId int, startDate, endDate
 		return list, err
 	}
 	var pars []interface{}
+	pars = append(pars, edbInfoId)
 	sql := `SELECT edb_data_id,edb_info_id,data_time,value,data_timestamp FROM %s WHERE edb_info_id=? `
 	if startDate != "" {
 		sql += ` AND data_time>=? `
@@ -506,7 +507,7 @@ func getEdbDataListByMysql(source, subSource, edbInfoId int, startDate, endDate
 	sql += ` ORDER BY data_time ASC `
 	sql = fmt.Sprintf(sql, tableName)
 	o := global.DbMap[utils.DbNameIndex]
-	err = o.Raw(sql, edbInfoId, pars).Find(&list).Error
+	err = o.Raw(sql, pars...).Find(&list).Error
 	return
 }
 
@@ -615,6 +616,7 @@ func getEdbDataListMinAndMaxByMysql(source, subSource, edbInfoId int, startDate,
 	tableName := GetEdbDataTableName(source, subSource)
 	sql := `SELECT min(value) AS min_data,max(value) AS max_data FROM %s WHERE edb_info_id=? `
 	var pars []interface{}
+	pars = append(pars, edbInfoId)
 	var condition string
 
 	if startDate != "" {
@@ -634,7 +636,7 @@ func getEdbDataListMinAndMaxByMysql(source, subSource, edbInfoId int, startDate,
 		sql += condition
 	}
 
-	err = o.Raw(sql, edbInfoId, pars).Row().Scan(&minData, &maxData)
+	err = o.Raw(sql, pars...).Row().Scan(&minData, &maxData)
 	return
 }
 
@@ -836,7 +838,7 @@ type YData struct {
 
 func ModifyChartInfoAndMapping(edbInfoIdStr string, req *SaveChartInfoReq, chartType int) (err error) {
 	o := global.DbMap[utils.DbNameIndex]
-	to := o.Begin() 
+	to := o.Begin()
 	if to.Error != nil {
 		return to.Error
 	}
@@ -981,7 +983,7 @@ func ModifyChartInfoAndMapping(edbInfoIdStr string, req *SaveChartInfoReq, chart
 // EditChartInfoAndMapping 修改 ETA图库 的 图表与指标 的关系
 func EditChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr string, calendar string, dateType, disabled int, barChartConf string, chartEdbInfoList []*ChartSaveItem, seasonExtra string) (err error) {
 	o := global.DbMap[utils.DbNameIndex]
-	to := o.Begin() 
+	to := o.Begin()
 	if to.Error != nil {
 		return to.Error
 	}
@@ -1120,7 +1122,7 @@ func EditChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr string, calenda
 			tmpChartEdbMapping.ConvertUnit = v.ConvertUnit
 			tmpChartEdbMapping.ConvertEnUnit = v.ConvertEnUnit
 			err = to.Select("ModifyTime", "MaxData", "MinData", "IsOrder", "IsAxis", "EdbInfoType", "LeadValue", "LeadUnit", "ChartStyle", "ChartColor", "PredictChartColor", "ChartWidth", "EdbAliasName",
-				"IsConvert", "ConvertType", "ConvertValue", "ConvertUnit", "ConvertEnUnit").Updates(tmpChartEdbMapping).Error 
+				"IsConvert", "ConvertType", "ConvertValue", "ConvertUnit", "ConvertEnUnit").Updates(tmpChartEdbMapping).Error
 			if err != nil {
 				fmt.Println("chart_edb_mapping Err:" + err.Error())
 				return err
@@ -1174,7 +1176,7 @@ func EditChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr string, calenda
 // EditFutureGoodChartInfoAndMapping 修改商品价格曲线的 图表与指标 的关系
 func EditFutureGoodChartInfoAndMapping(req *EditFutureGoodChartInfoReq, edbInfoIdStr string, calendar string, dateType, disabled int, barChartConf string) (err error) {
 	o := global.DbMap[utils.DbNameIndex]
-	to := o.Begin() 
+	to := o.Begin()
 	if to.Error != nil {
 		return to.Error
 	}
@@ -1332,7 +1334,7 @@ func EditFutureGoodChartInfoAndMapping(req *EditFutureGoodChartInfoReq, edbInfoI
 // @return err error
 func EditChartEnInfoAndEdbEnInfo(req *EditChartEnInfoReq) (err error) {
 	o := global.DbMap[utils.DbNameIndex]
-	to := o.Begin() 
+	to := o.Begin()
 	if to.Error != nil {
 		return to.Error
 	}
@@ -1382,7 +1384,7 @@ func EditChartEnInfoAndEdbEnInfo(req *EditChartEnInfoReq) (err error) {
 			  unit_en = ?,
 			  modify_time = NOW()
 			WHERE edb_info_id = ? `
-				err = to.Exec(msql, v.EdbNameEn, v.UnitEn, v.EdbInfoId).Error
+			err = to.Exec(msql, v.EdbNameEn, v.UnitEn, v.EdbInfoId).Error
 			if err != nil {
 				fmt.Println("edb_info Err:" + err.Error())
 				return err
@@ -1402,7 +1404,7 @@ func EditChartEnInfoAndEdbEnInfo(req *EditChartEnInfoReq) (err error) {
 // @return err error
 func EditChartBaseInfoAndEdbEnInfo(req *EditChartInfoBaseReq, chartItem *ChartInfo, lang string) (err error) {
 	o := global.DbMap[utils.DbNameIndex]
-	to := o.Begin() 
+	to := o.Begin()
 	if to.Error != nil {
 		return to.Error
 	}
@@ -1717,7 +1719,7 @@ func ChartInfoSearchByKeyWord(keyword string, showSysId int) (searchList []*Char
 	if keyword == "" {
 		sql += ` LIMIT 100 `
 	}
-	err = o.Raw(sql, pars).Scan(&searchList).Error
+	err = o.Raw(sql, pars...).Scan(&searchList).Error
 	return
 }
 
@@ -1744,7 +1746,7 @@ func ChartInfoSearchByEmptyKeyWord(showSysId int, sourceList []int, noPermission
 
 	// 查找数量
 	totalSql := " SELECT count(1) as total " + baseSql
-	err = o.Raw(totalSql, basePars).Scan(&total).Error
+	err = o.Raw(totalSql, basePars...).Scan(&total).Error
 	if err != nil {
 		return
 	}
@@ -1753,7 +1755,7 @@ func ChartInfoSearchByEmptyKeyWord(showSysId int, sourceList []int, noPermission
 	sql := " SELECT *  " + baseSql + ` ORDER BY create_time DESC LIMIT ?,? `
 	basePars = append(basePars, startSize, pageSize)
 
-	err = o.Raw(sql, basePars).Scan(&searchList).Error
+	err = o.Raw(sql, basePars...).Scan(&searchList).Error
 
 	return
 }
@@ -2768,7 +2770,7 @@ func UpdateChartInfoSortByClassifyIdV2(classifyId, nowSort int, prevChartInfoId
 // GetChartInfoMaxSortByClassifyId 获取分类下指标的最大的排序数
 func GetChartInfoMaxSortByClassifyId(classifyId int) (sort int, err error) {
 	o := global.DbMap[utils.DbNameIndex]
-	sql := `SELECT Max(sort) AS sort FROM chart_info WHERE chart_classify_id = ? `
+	sql := `SELECT COALESCE(MAX(sort), 0) AS sort FROM chart_info WHERE chart_classify_id = ? `
 	err = o.Raw(sql, classifyId).Scan(&sort).Error
 	return
 }
@@ -2786,7 +2788,7 @@ func GetChartInfoBySourceAndParentId(source, parentId, adminId int) (items []*Ch
 		pars = append(pars, adminId)
 	}
 	sql += ` ORDER BY sort asc,chart_info_id ASC `
-	err = o.Raw(sql, pars).Find(&items).Error
+	err = o.Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -2912,7 +2914,7 @@ func GetChartInfoItemsByCondition(condition string, pars []interface{}) (item []
 	if condition != "" {
 		sql += condition
 	}
-	err = o.Raw(sql, pars).Find(&item).Error
+	err = o.Raw(sql, pars...).Find(&item).Error
 	return
 }