xyxie 6 mesi fa
parent
commit
85dcda0c9c

+ 1 - 1
models/ai_summary/ai_pormpt.go

@@ -120,7 +120,7 @@ func GetAiPromptMaxSort(adminId int) (sort int, err error) {
 	//o := orm.NewOrm()
 	//sql := `SELECT Max(sort) AS sort FROM ai_prompt WHERE sys_admin_id=? `
 	//err = o.Raw(sql, adminId).QueryRow(&sort)
-	sql := `SELECT  COALESCE(Max(sort), 0) AS sort FROM ai_prompt WHERE sys_admin_id=? `
+	sql := `SELECT  COALESCE(MAX(sort), 0) AS sort FROM ai_prompt WHERE sys_admin_id=? `
 	err = global.DEFAULT_DmSQL.Raw(sql, adminId).First(&sort).Error
 	return
 }

+ 1 - 1
models/ai_summary/ai_summary.go

@@ -191,7 +191,7 @@ func GetAiSummaryMaxSort(classifyId int) (sort int, err error) {
 	//o := orm.NewOrm()
 	//sql := `SELECT Max(sort) AS sort FROM ai_summary WHERE parent_id=? `
 	//err = o.Raw(sql, classifyId).QueryRow(&sort)
-	sql := `SELECT  COALESCE(Max(sort), 0) AS sort FROM ai_summary WHERE parent_id=? `
+	sql := `SELECT  COALESCE(MAX(sort), 0) AS sort FROM ai_summary WHERE parent_id=? `
 	err = global.DEFAULT_DmSQL.Raw(sql, classifyId).Scan(&sort).Error
 	return
 }

+ 1 - 1
models/ai_summary/ai_summary_classify.go

@@ -187,7 +187,7 @@ func GetAiSummaryClassifyMaxSort(parentId int) (sort int, err error) {
 	//o := orm.NewOrm()
 	//sql := `SELECT Max(sort) AS sort FROM ai_summary_classify WHERE parent_id=? `
 	//err = o.Raw(sql, parentId).QueryRow(&sort)
-	sql := `SELECT  COALESCE(Max(sort), 0) AS sort FROM ai_summary_classify WHERE parent_id=? `
+	sql := `SELECT  COALESCE(MAX(sort), 0) AS sort FROM ai_summary_classify WHERE parent_id=? `
 	err = global.DEFAULT_DmSQL.Raw(sql, parentId).Scan(&sort).Error
 	return
 }

+ 2 - 2
models/chart_permission.go

@@ -214,7 +214,7 @@ func (c *ChartPermission) GetMaxSort() (maxSort int, err error) {
 	//o := orm.NewOrmUsingDB("rddp")
 	//sql := `select max(sort) from chart_permission `
 	//err = o.Raw(sql).QueryRow(&maxSort)
-	sql := `select COALESCE(Max(sort), 0) as max_sort from chart_permission `
+	sql := `select COALESCE(MAX(sort), 0) as max_sort from chart_permission `
 	err = global.DmSQL["rddp"].Raw(sql).Scan(&maxSort).Error
 	return
 }
@@ -224,7 +224,7 @@ func (c *ChartPermission) GetMaxSortByParentId(parentId int) (maxSort int, err e
 	//o := orm.NewOrmUsingDB("rddp")
 	//sql := `select max(sort) from chart_permission WHERE parent_id=? `
 	//err = o.Raw(sql, parentId).QueryRow(&maxSort)
-	sql := `select  COALESCE(Max(sort), 0) as max_sort from chart_permission WHERE parent_id=? `
+	sql := `select  COALESCE(MAX(sort), 0) as max_sort from chart_permission WHERE parent_id=? `
 	err = global.DmSQL["rddp"].Raw(sql, parentId).Scan(&maxSort).Error
 	return
 }

+ 2 - 2
models/classify.go

@@ -465,7 +465,7 @@ func (classifyInfo *Classify) GetMaxSortByParentId(parentId int) (maxSort int, e
 	//o := orm.NewOrmUsingDB("rddp")
 	//sql := `SELECT max(sort) AS sort FROM classify WHERE parent_id = ? `
 	//err = o.Raw(sql, parentId).QueryRow(&maxSort)
-	sql := `SELECT  COALESCE(Max(sort), 0) AS sort FROM classify WHERE parent_id = ? `
+	sql := `SELECT  COALESCE(MAX(sort), 0) AS sort FROM classify WHERE parent_id = ? `
 	err = global.DmSQL["rddp"].Raw(sql, parentId).Scan(&maxSort).Error
 	return
 }
@@ -475,7 +475,7 @@ func (classifyInfo *Classify) GetMaxSort() (maxSort int, err error) {
 	//o := orm.NewOrmUsingDB("rddp")
 	//sql := `SELECT max(sort) AS sort FROM classify`
 	//err = o.Raw(sql).QueryRow(&maxSort)
-	sql := `SELECT  COALESCE(Max(sort), 0) AS sort FROM classify`
+	sql := `SELECT  COALESCE(MAX(sort), 0) AS sort FROM classify`
 	err = global.DmSQL["rddp"].Raw(sql).Scan(&maxSort).Error
 	return
 }

+ 2 - 2
models/data_manage/baiinfo_data.go

@@ -151,7 +151,7 @@ func GetBaiinfoIndexDataByCode(indexCode string) (items []*BaiinfoIndexData, err
 }
 
 func GetBaiinfoDataMaxCount(classifyId int) (count int, err error) {
-	sql := `SELECT MAX(t.num) AS count FROM (
+	sql := `SELECT COALESCE(MAX(t.num), 0) AS count FROM (
 				SELECT COUNT(1) AS num  FROM base_from_baiinfo_index AS a
 				INNER JOIN base_from_baiinfo_data AS b ON a.index_code=b.index_code
 				WHERE a.classify_id=?
@@ -172,7 +172,7 @@ func GetExportBaiinfoDataMaxCount(typeCodes []string) (items []*ExportBaiinfoDat
 		return
 	}
 	sql := ` SELECT
-				MAX(t.num) AS count,
+				COALESCE(MAX(t.num), 0) AS count,
 				t.type_name
 			FROM
 				(

+ 1 - 1
models/data_manage/base_from_baiinfo.go

@@ -106,7 +106,7 @@ func GetBaseFromBaiinfoIndexByIndexId(indexId int) (item *BaseFromBaiinfoIndex,
 // GetBaseFromBaiinfoIndexMaxSortByClassifyId 根据指标id获取指标信息
 func GetBaseFromBaiinfoIndexMaxSortByClassifyId(classifyId int) (sort int, err error) {
 	o := global.DmSQL["data"]
-	sql := `SELECT  COALESCE(Max(sort), 0) as sort FROM base_from_baiinfo_index WHERE classify_id=? `
+	sql := `SELECT  COALESCE(MAX(sort), 0) as sort FROM base_from_baiinfo_index WHERE classify_id=? `
 	err = o.Raw(sql, classifyId).Scan(&sort).Error
 
 	return

+ 1 - 1
models/data_manage/base_from_mtjh.go

@@ -151,7 +151,7 @@ func GetClassifyMtjhByArea(area string) (items []*string, err error) {
 func GetCoalMtjhMaxCount(area string) (count int, err error) {
 	o := global.DmSQL["data"]
 	sql := `SELECT
-	MAX( t.num ) AS count 
+	COALESCE(MAX(t.num), 0) AS count 
 FROM
 	(
 	SELECT

+ 1 - 1
models/data_manage/base_from_sci_hq_classify.go

@@ -90,7 +90,7 @@ func GetChildSciHqClassifyIdsById(classifyId int) (items []int, err error) {
 // GetChildSciHqClassifyMaxSortById 获取子分类最大排序
 func GetChildSciHqClassifyMaxSortById(classifyId int) (sort int, err error) {
 	o := global.DmSQL["data"]
-	sql := ` SELECT MAX(sort) AS sort FROM base_from_sci_hq_classify WHERE parent_id=? `
+	sql := ` SELECT COALESCE(MAX(sort), 0)  AS sort FROM base_from_sci_hq_classify WHERE parent_id=? `
 	err = o.Raw(sql, classifyId).Scan(&sort).Error
 
 	return

+ 2 - 2
models/data_manage/base_from_sci_hq_index.go

@@ -218,7 +218,7 @@ func GetSciHqIndexBaseInfoByCondition(condition string, pars []interface{}) (ite
 
 func GetSciHqDataMaxCount(condition string, pars []interface{}) (count int, err error) {
 	o := global.DmSQL["data"]
-	sql := `SELECT MAX(t.num) AS count FROM ( SELECT COUNT(1) AS num  FROM base_from_sci_hq_index AS a INNER JOIN base_from_sci_hq_data AS b ON a.index_code=b.index_code WHERE 1=1  `
+	sql := `SELECT COALESCE(MAX(t.num),0) AS count FROM ( SELECT COUNT(1) AS num  FROM base_from_sci_hq_index AS a INNER JOIN base_from_sci_hq_data AS b ON a.index_code=b.index_code WHERE 1=1  `
 	if condition != "" {
 		sql += condition
 	}
@@ -231,7 +231,7 @@ func GetSciHqDataMaxCount(condition string, pars []interface{}) (count int, err
 // GetSciHqIndexMaxSortByClassifyId 根据分类id获取指标最大排序
 func GetSciHqIndexMaxSortByClassifyId(classifyId int) (sort int, err error) {
 	o := global.DmSQL["data"]
-	sql := `SELECT MAX(sort) FROM base_from_sci_index WHERE classify_id=? `
+	sql := `SELECT COALESCE(MAX(sort), 0) as sort FROM base_from_sci_index WHERE classify_id=? `
 	err = o.Raw(sql, classifyId).Scan(&sort).Error
 
 	return

+ 1 - 1
models/data_manage/base_from_smm.go

@@ -215,7 +215,7 @@ func GetBaseFromSmmIndexByIndexId(indexId int) (item *BaseFromSmmIndex, err erro
 // GetBaseFromSmmIndexMaxSortByClassifyId 根据指标id获取指标信息
 func GetBaseFromSmmIndexMaxSortByClassifyId(classifyId int) (sort int, err error) {
 	o := global.DmSQL["data"]
-	sql := `SELECT max(sort) FROM base_from_smm_index WHERE classify_id=? `
+	sql := `SELECT COALESCE(MAX(sort), 0) as sort FROM base_from_smm_index WHERE classify_id=? `
 	err = o.Raw(sql, classifyId).Scan(&sort).Error
 
 	return

+ 1 - 1
models/data_manage/base_from_ths_hf.go

@@ -441,7 +441,7 @@ func UpdateThsHfIndexSortByClassifyId(classifyId, nowSort int, prevEdbInfoId int
 // GetThsHfIndexMaxSortByClassifyId 获取分类下指标的最大的排序数
 func GetThsHfIndexMaxSortByClassifyId(classifyId int) (sort int, err error) {
 	o := global.DmSQL["data"]
-	sql := `SELECT Max(sort) AS sort FROM base_from_ths_hf_index WHERE base_from_ths_hf_classify_id = ?`
+	sql := `SELECT COALESCE(MAX(sort), 0) as sort FROM base_from_ths_hf_index WHERE base_from_ths_hf_classify_id = ?`
 	err = o.Raw(sql, classifyId).Scan(&sort).Error
 
 	return

+ 1 - 1
models/data_manage/base_from_ths_hf_classify.go

@@ -214,7 +214,7 @@ type ThsHfClassifyEditReq struct {
 
 func (m *BaseFromThsHfClassify) GetSortMax(parentId int) (sort int, err error) {
 	o := global.DmSQL["data"]
-	sql := fmt.Sprintf(`SELECT Max(%s) FROM %s WHERE %s = ?`, m.Cols().Sort, m.TableName(), m.Cols().ParentId)
+	sql := fmt.Sprintf(`SELECT COALESCE(MAX(%s), 0) as sort FROM %s WHERE %s = ?`, m.Cols().Sort, m.TableName(), m.Cols().ParentId)
 	err = o.Raw(sql, parentId).Scan(&sort).Error
 
 	return

+ 2 - 2
models/data_manage/coal_data.go

@@ -24,7 +24,7 @@ func GetCoalItemList(keyword string) (items []*BaseFromCoalmineMapping, err erro
 func GetCoalCompanyMaxCount(suffix, classifyName string) (count int, err error) {
 	o := global.DmSQL["data"]
 	sql := `SELECT
-	MAX( t.num ) AS count 
+	COALESCE(MAX( t.num ), 0) AS count 
 FROM
 	(
 	SELECT
@@ -44,7 +44,7 @@ GROUP BY
 func GetCoalJsmMaxCount(classifyName string) (count int, err error) {
 	o := global.DmSQL["data"]
 	sql := `SELECT
-	MAX( t.num ) AS count 
+	COALESCE(MAX( t.num ), 0) AS count 
 FROM
 	(
 	SELECT

+ 1 - 1
models/data_manage/edb_classify.go

@@ -505,7 +505,7 @@ type AddEdbClassifyReqV2 struct {
 
 // GetEdbClassifyMaxSortV2 获取分类下最大的排序数
 func GetEdbClassifyMaxSortV2(parentId int, classifyType uint8) (sort int, err error) {
-	sql := `SELECT Max(sort) AS sort FROM edb_classify WHERE parent_id=? AND parent_id_two=? AND classify_type=? `
+	sql := `SELECT COALESCE(MAX(sort), 0) AS sort FROM edb_classify WHERE parent_id=? AND parent_id_two=? AND classify_type=? `
 	err = global.DmSQL["data"].Raw(sql, parentId, classifyType).Scan(&sort).Error
 
 	return

+ 1 - 1
models/data_manage/sci_data.go

@@ -190,7 +190,7 @@ func GetSciDataMaxCount(classifyId int) (count int, err error) {
 	//		)AS t `
 	//err = o.Raw(sql, classifyId).QueryRow(&count)
 
-	sql := `SELECT MAX(t.num) AS count FROM (
+	sql := `SELECT COALESCE(MAX(t.num), 0) AS count FROM (
 				SELECT COUNT(1) AS num  FROM base_from_sci_index AS a
 				INNER JOIN base_from_sci_data AS b ON a.index_code=b.index_code
 				WHERE a.classify_id=?

+ 1 - 1
models/data_manage/smm_data.go

@@ -231,7 +231,7 @@ func GetSmmDataMaxCount(classifyId int) (count int, err error) {
 	//		)AS t `
 	//err = o.Raw(sql, classifyId).QueryRow(&count)
 
-	sql := `SELECT MAX(t.num) AS count FROM (
+	sql := `SELECT COALESCE(MAX(t.num), 0) AS count FROM (
 				SELECT COUNT(1) AS num  FROM base_from_smm_index AS a
 				INNER JOIN base_from_smm_data AS b ON a.index_code=b.index_code
 				WHERE a.classify_id=?

+ 2 - 2
models/en_permission.go

@@ -252,7 +252,7 @@ func UpdateEnPermissionSortByParentId(parentId, permissionId, nowSort int, updat
 // GetMaxSortByParentId 获取最大的排序值
 func (m *EnPermission) GetMaxSortByParentId(parentId int) (maxSort int, err error) {
 	//o := orm.NewOrmUsingDB("rddp")
-	sql := fmt.Sprintf(`SELECT max(%s) AS sort FROM %s WHERE %s = ? `, EnPermissionColumns.Sort, m.TableName(), EnPermissionColumns.ParentId)
+	sql := fmt.Sprintf(`SELECT COALESCE(MAX(%s), 0) AS sort FROM %s WHERE %s = ? `, EnPermissionColumns.Sort, m.TableName(), EnPermissionColumns.ParentId)
 	//err = o.Raw(sql, parentId).QueryRow(&maxSort)
 	err = global.DmSQL["rddp"].Raw(sql, parentId).Scan(&maxSort).Error
 	return
@@ -261,7 +261,7 @@ func (m *EnPermission) GetMaxSortByParentId(parentId int) (maxSort int, err erro
 // GetMaxSort 获取最大的排序值
 func (m *EnPermission) GetMaxSort() (maxSort int, err error) {
 	//o := orm.NewOrmUsingDB("rddp")
-	sql := fmt.Sprintf(`SELECT max(%s) AS sort FROM %s`, EnPermissionColumns.Sort, m.TableName())
+	sql := fmt.Sprintf(`SELECT COALESCE(MAX(%s), 0) AS sort FROM %s`, EnPermissionColumns.Sort, m.TableName())
 	//err = o.Raw(sql).QueryRow(&maxSort)
 	err = global.DmSQL["rddp"].Raw(sql).Scan(&maxSort).Error
 	return

+ 1 - 1
models/english_classify.go

@@ -20,7 +20,7 @@ func UpdateEnglishClassifySortByParentId(parentId, permissionId, nowSort int, up
 // GetMaxSortByParentId 获取最大的排序值
 func (classifyInfo *EnglishClassify) GetMaxSortByParentId(parentId int) (maxSort int, err error) {
 	//o := orm.NewOrmUsingDB("rddp")
-	sql := `SELECT  COALESCE(Max(sort), 0) AS sort FROM english_classify WHERE parent_id = ? `
+	sql := `SELECT  COALESCE(MAX(sort), 0) AS sort FROM english_classify WHERE parent_id = ? `
 	//err = o.Raw(sql, parentId).QueryRow(&maxSort)
 	err = global.DmSQL["rddp"].Raw(sql, parentId).Scan(&maxSort).Error
 	return

+ 4 - 4
models/english_report.go

@@ -55,11 +55,11 @@ func GetEnglishReportStage(classifyIdFirst, classifyIdSecond int) (count int, er
 	//o := orm.NewOrmUsingDB("rddp")
 	sql := ``
 	if classifyIdSecond > 0 {
-		sql = "SELECT MAX(stage) AS max_stage FROM english_report WHERE classify_id_second=? "
+		sql = "SELECT COALESCE(Max(stage), 0) AS max_stage FROM english_report WHERE classify_id_second=? "
 		err = global.DmSQL["rddp"].Raw(sql, classifyIdSecond).Scan(&count).Error
 		//o.Raw(sql, classifyIdSecond).QueryRow(&count)
 	} else {
-		sql = "SELECT MAX(stage) AS max_stage FROM english_report WHERE classify_id_first=? "
+		sql = "SELECT COALESCE(Max(stage), 0) AS max_stage FROM english_report WHERE classify_id_first=? "
 		err = global.DmSQL["rddp"].Raw(sql, classifyIdFirst).Scan(&count).Error
 		//o.Raw(sql, classifyIdFirst).QueryRow(&count)
 	}
@@ -70,11 +70,11 @@ func GetEnglishReportStageEdit(classifyIdFirst, classifyIdSecond, reportId int)
 	//o := orm.NewOrmUsingDB("rddp")
 	sql := ``
 	if classifyIdSecond > 0 {
-		sql = "SELECT MAX(stage) AS max_stage FROM english_report WHERE classify_id_second=? AND id<>? "
+		sql = "SELECT COALESCE(Max(stage), 0) AS max_stage FROM english_report WHERE classify_id_second=? AND id<>? "
 		//o.Raw(sql, classifyIdSecond, reportId).QueryRow(&count)
 		err = global.DmSQL["rddp"].Raw(sql, classifyIdSecond, reportId).Scan(&count).Error
 	} else {
-		sql = "SELECT MAX(stage) AS max_stage FROM english_report WHERE classify_id_first=? AND id<>? "
+		sql = "SELECT COALESCE(Max(stage), 0) AS max_stage FROM english_report WHERE classify_id_first=? AND id<>? "
 		err = global.DmSQL["rddp"].Raw(sql, classifyIdFirst, reportId).Scan(&count).Error
 		//o.Raw(sql, classifyIdFirst, reportId).QueryRow(&count)
 	}

+ 1 - 1
models/report_chapter.go

@@ -563,7 +563,7 @@ func (chapterChapterInfo *ReportChapter) GetFirstReportChapterByReportId(reportI
 // @return err error
 func (chapterChapterInfo *ReportChapter) GetMaxSortByReportId(reportId int) (maxSort int, err error) {
 	//o := orm.NewOrmUsingDB("rddp")
-	sql := `SELECT max(sort) AS sort FROM report_chapter WHERE report_id = ?`
+	sql := `SELECT COALESCE(MAX(sort), 0) AS sort FROM report_chapter WHERE report_id = ?`
 	//err = o.Raw(sql, reportId).QueryRow(&maxSort)
 	err = global.DmSQL["rddp"].Raw(sql, reportId).Scan(&maxSort).Error
 	return

+ 2 - 2
models/report_chapter_type.go

@@ -434,7 +434,7 @@ func GetReportChapterTypeByCondition(condition string, pars []interface{}) (item
 // GetMaxSort 获取最大的排序值
 func (r *ReportChapterType) GetMaxSort() (maxSort int, err error) {
 	//o := orm.NewOrmUsingDB("rddp")
-	sql := `SELECT max(sort) AS sort FROM report_chapter_type`
+	sql := `SELECT COALESCE(MAX(sort), 0) AS sort FROM report_chapter_type`
 	//err = o.Raw(sql).QueryRow(&maxSort)
 	err = global.DmSQL["rddp"].Raw(sql).Scan(&maxSort).Error
 	return
@@ -443,7 +443,7 @@ func (r *ReportChapterType) GetMaxSort() (maxSort int, err error) {
 // GetMaxSortByResearchType 获取最大的排序值
 func (r *ReportChapterType) GetMaxSortByResearchType(researchType string) (maxSort int, err error) {
 	//o := orm.NewOrmUsingDB("rddp")
-	sql := `SELECT max(sort) AS sort FROM report_chapter_type WHERE research_type = ?`
+	sql := `SELECT COALESCE(MAX(sort), 0) AS sort FROM report_chapter_type WHERE research_type = ?`
 	//err = o.Raw(sql, researchType).QueryRow(&maxSort)
 	err = global.DmSQL["rddp"].Raw(sql, researchType).Scan(&maxSort).Error
 	return

+ 1 - 1
models/sandbox/sandbox_classify.go

@@ -118,7 +118,7 @@ func GetSandboxClassifyCount(sandboxClassifyName string, parentId int) (count in
 // GetSandboxClassifyMaxSort 获取沙盘分类下最大的排序数
 func GetSandboxClassifyMaxSort(parentId int) (sort int, err error) {
 	//o := orm.NewOrmUsingDB("data")
-	sql := `SELECT Max(sort) AS sort FROM sandbox_classify WHERE parent_id=? `
+	sql := `SELECT COALESCE(MAX(sort), 0) AS sort FROM sandbox_classify WHERE parent_id=? `
 	//err = o.Raw(sql, parentId).QueryRow(&sort)
 	err = global.DmSQL["data"].Raw(sql, parentId).Scan(&sort).Error
 	return

+ 1 - 1
models/target.go

@@ -1236,7 +1236,7 @@ func GetLongzhongpriceinfoByClassifyName(productName string) (items []*Longzhong
 
 func GetLongzhongPriceDataMaxCount(productName string) (count int, err error) {
 	//o := orm.NewOrmUsingDB("edb")
-	sql := `SELECT MAX(t.num) AS count FROM (
+	sql := `SELECT COALESCE(MAX(t.num), 0) AS count FROM (
 				SELECT COUNT(1) AS num  FROM longzhongpriceinfo AS a
 				INNER JOIN longzhongpricedata AS b ON a.longzhongpriceinfo_id=b.longzhongpriceinfo_id
 				WHERE a.product_name=?