Merge remote-tracking branch 'origin/dm' into dm

models/base_from_mysteel_chemical_classify.go

@@ -47,7 +47,7 @@ func GetMysteelClassify(classifyName string, parentId int) (item *BaseFromMystee
 // GetEdbClassifyMaxSort 获取分类下最大的排序数
 func GetMysteelClassifyMaxSort(parentId int) (sort int, err error) {
 	//o := orm.NewOrm()
-	sql := `SELECT Max(sort) AS sort FROM base_from_mysteel_chemical_classify WHERE parent_id=? `
+	sql := `SELECT COALESCE(MAX(sort), 0) AS sort FROM base_from_mysteel_chemical_classify WHERE parent_id=? `
 	//err = o.Raw(sql, parentId).QueryRow(&sort)
 	err = global.DEFAULT_DmSQL.Raw(sql, parentId).Scan(&sort).Error
 	return

models/edb_info.go

@@ -1670,7 +1670,7 @@ type ResetEdbClassifyReq struct {
 // GetEdbInfoMaxSortByClassifyId 获取分类下指标的最大的排序数
 func GetEdbInfoMaxSortByClassifyId(classifyId int) (sort int, err error) {
 
-	sql := `SELECT Max(sort) AS sort FROM edb_info WHERE classify_id=? `
+	sql := `SELECT COALESCE(MAX(sort), 0) as sort FROM edb_info WHERE classify_id=? `
 	err = global.DEFAULT_DmSQL.Raw(sql, classifyId).Scan(&sort).Error
 	return
 }

models/supply_analysis/variety.go

@@ -185,7 +185,7 @@ func (variety *Variety) Update(cols []string) (err error) {
 // GetVarietyMaxSort 获取图表分类下最大的排序数
 func GetVarietyMaxSort(parentId int) (sort int, err error) {
 
-	sql := `SELECT Max(sort) AS sort FROM future_good_chart_classify WHERE parent_id=? AND is_delete=0 `
+	sql := `SELECT COALESCE(MAX(sort), 0) AS sort FROM future_good_chart_classify WHERE parent_id=? AND is_delete=0 `
 	err = global.DEFAULT_DmSQL.Raw(sql, parentId).Scan(&sort).Error
 	return
 }

models/trade_analysis/trade_analysis.go

@@ -349,7 +349,7 @@ func GetLastTradeDataByClassify(exchange, classifyName string, contracts []strin
 		JOIN 
 			(
 				SELECT
-					data_time, classify_type, MAX(rank) AS max_rank
+					data_time, classify_type, COALESCE(MAX("rank"), 0) AS max_rank
 				FROM 
 					%s
 				WHERE 
@@ -371,7 +371,7 @@ func GetLastTradeDataByClassify(exchange, classifyName string, contracts []strin
 		JOIN 
 			(
 				SELECT 
-					data_time, classify_type, MAX(rank) AS max_rank
+					data_time, classify_type, COALESCE(MAX("rank"), 0) AS max_rank
 				FROM 
 					%s
 				WHERE 
@@ -415,7 +415,7 @@ func GetLastTradeZhengzhouDataByClassify(exchange string, contracts []string) (i
 		JOIN 
 			(
 				SELECT
-					data_time, classify_name, MAX(rank) AS max_rank
+					data_time, classify_name, COALESCE(MAX("rank"), 0) AS max_rank
 				FROM 
 					%s
 				WHERE 
@@ -437,7 +437,7 @@ func GetLastTradeZhengzhouDataByClassify(exchange string, contracts []string) (i
 		JOIN 
 			(
 				SELECT 
-					data_time, classify_name, MAX(rank) AS max_rank
+					data_time, classify_name, COALESCE(MAX("rank"), 0) AS max_rank
 				FROM 
 					%s
 				WHERE