Merge branch 'feature/eta2.4.4_gpr_risk' into debug

models/data_manage/base_from_usda_fas_classify.go

@@ -31,7 +31,7 @@ func AddBaseFromUsdaFasClassify(item *BaseFromUsdaFasClassify) (lastId int64, er
 // GetBaseFromUsdaFasClassifyCount 获取分类名称的个数
 func GetBaseFromUsdaFasClassifyCount(classifyName string, parentId int) (count int, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT COUNT(1) AS count FROM base_from_gpr_risk_classify WHERE classify_name=? AND parent_id=? `
+	sql := `SELECT COUNT(1) AS count FROM base_from_usda_fas_classify WHERE classify_name=? AND parent_id=? `
 	err = o.Raw(sql, classifyName, parentId).QueryRow(&count)
 	return
 }
@@ -39,7 +39,7 @@ func GetBaseFromUsdaFasClassifyCount(classifyName string, parentId int) (count i
 // GetBaseFromUsdaFasClassifyById 通过分类id的获取分类信息
 func GetBaseFromUsdaFasClassifyById(classifyId int) (item *BaseFromUsdaFasClassify, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM base_from_gpr_risk_classify WHERE classify_id=? `
+	sql := `SELECT * FROM base_from_usda_fas_classify WHERE classify_id=? `
 	err = o.Raw(sql, classifyId).QueryRow(&item)
 	return
 }
@@ -50,7 +50,7 @@ func GetBaseFromUsdaFasClassifyByIds(classifyIds []int) (items []*BaseFromUsdaFa
 		return
 	}
 	o := orm.NewOrmUsingDB("data")
-	sql := `SELECT * FROM base_from_gpr_risk_classify WHERE classify_id IN (` + utils.GetOrmInReplace(len(classifyIds)) + `) `
+	sql := `SELECT * FROM base_from_usda_fas_classify WHERE classify_id IN (` + utils.GetOrmInReplace(len(classifyIds)) + `) `
 	_, err = o.Raw(sql, classifyIds).QueryRows(&items)
 	return
 }
@@ -58,7 +58,7 @@ func GetBaseFromUsdaFasClassifyByIds(classifyIds []int) (items []*BaseFromUsdaFa
 // EditBaseFromUsdaFasClassify 修改UsdaFas原始数据分类
 func EditBaseFromUsdaFasClassify(classifyId int, classifyName string) (err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := `UPDATE base_from_gpr_risk_classify SET classify_name=?,modify_time=NOW() WHERE classify_id=? `
+	sql := `UPDATE base_from_usda_fas_classify SET classify_name=?,modify_time=NOW() WHERE classify_id=? `
 	_, err = o.Raw(sql, classifyName, classifyId).Exec()
 	return
 }
@@ -66,7 +66,7 @@ func EditBaseFromUsdaFasClassify(classifyId int, classifyName string) (err error
 // UpdateBaseFromUsdaFasClassifySort 修改UsdaFas原始数据分类的排序
 func UpdateBaseFromUsdaFasClassifySort(classifyId int) (err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := `UPDATE base_from_gpr_risk_classify SET sort=classify_id, modify_time=NOW() WHERE classify_id=? `
+	sql := `UPDATE base_from_usda_fas_classify SET sort=classify_id, modify_time=NOW() WHERE classify_id=? `
 	_, err = o.Raw(sql, classifyId).Exec()
 	return
 }
@@ -108,7 +108,7 @@ type BaseFromUsdaFasClassifyItemsButton struct {
 // GetBaseFromUsdaFasClassifyByParentId 根据上级id获取当下的分类列表数据
 func GetBaseFromUsdaFasClassifyByParentId(parentId int) (items []*BaseFromUsdaFasClassifyItems, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT * FROM base_from_gpr_risk_classify WHERE parent_id=? order by sort asc,classify_id asc`
+	sql := ` SELECT * FROM base_from_usda_fas_classify WHERE parent_id=? order by sort asc,classify_id asc`
 	_, err = o.Raw(sql, parentId).QueryRows(&items)
 	return
 }
@@ -116,7 +116,7 @@ func GetBaseFromUsdaFasClassifyByParentId(parentId int) (items []*BaseFromUsdaFa
 // GetAllBaseFromUsdaFasClassify 获取所有的分类列表数据
 func GetAllBaseFromUsdaFasClassify() (items []*BaseFromUsdaFasClassifyItems, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT * FROM base_from_gpr_risk_classify order by parent_id asc, sort asc,classify_id asc`
+	sql := ` SELECT * FROM base_from_usda_fas_classify order by parent_id asc, sort asc,classify_id asc`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
@@ -140,7 +140,7 @@ type BaseFromUsdaFasClassifySimplify struct {
 // GetFirstBaseFromUsdaFasClassify 获取当前分类下，且排序数相同 的排序第一条的数据
 func GetFirstBaseFromUsdaFasClassify() (item *BaseFromUsdaFasClassify, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT * FROM base_from_gpr_risk_classify order by sort asc,classify_id asc limit 1`
+	sql := ` SELECT * FROM base_from_usda_fas_classify order by sort asc,classify_id asc limit 1`
 	err = o.Raw(sql).QueryRow(&item)
 	return
 }
@@ -148,7 +148,7 @@ func GetFirstBaseFromUsdaFasClassify() (item *BaseFromUsdaFasClassify, err error
 // UpdateBaseFromUsdaFasClassifySortByClassifyId 根据分类id更新排序
 func UpdateBaseFromUsdaFasClassifySortByClassifyId(parentId, classifyId, nowSort int, updateSort string) (err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := ` update base_from_gpr_risk_classify set sort = ` + updateSort + ` WHERE parent_id=? AND sort > ? `
+	sql := ` update base_from_usda_fas_classify set sort = ` + updateSort + ` WHERE parent_id=? AND sort > ? `
 	if classifyId > 0 {
 		sql += ` or ( classify_id > ` + fmt.Sprint(classifyId) + ` and sort = ` + fmt.Sprint(nowSort) + `)`
 	}
@@ -159,7 +159,7 @@ func UpdateBaseFromUsdaFasClassifySortByClassifyId(parentId, classifyId, nowSort
 // MoveUpUsdaFasIndexClassifyBySort 往上移动
 func MoveUpUsdaFasIndexClassifyBySort(parentId, nextSort, currentSort int) (err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := `update base_from_gpr_risk_classify set sort = sort + 1 where parent_id=? and sort >= ? and sort< ?`
+	sql := `update base_from_usda_fas_classify set sort = sort + 1 where parent_id=? and sort >= ? and sort< ?`
 	_, err = o.Raw(sql, parentId, nextSort, currentSort).Exec()
 	return
 }
@@ -167,7 +167,7 @@ func MoveUpUsdaFasIndexClassifyBySort(parentId, nextSort, currentSort int) (err
 // MoveDownUsdaFasIndexClassifyBySort 往下移动
 func MoveDownUsdaFasIndexClassifyBySort(parentId, prevSort, currentSort int) (err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := `update base_from_gpr_risk_classify set sort = sort - 1 where parent_id=? and sort <= ? and sort> ? `
+	sql := `update base_from_usda_fas_classify set sort = sort - 1 where parent_id=? and sort <= ? and sort> ? `
 	_, err = o.Raw(sql, parentId, prevSort, currentSort).Exec()
 	return
 }
@@ -175,7 +175,7 @@ func MoveDownUsdaFasIndexClassifyBySort(parentId, prevSort, currentSort int) (er
 // GetUsdaFasIndexClassifyMinSort 获取最小不等于0的排序
 func GetUsdaFasIndexClassifyMinSort(parentId int) (sort int, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := `select min(sort) from base_from_gpr_risk_classify where parent_id=? and sort <> 0 `
+	sql := `select min(sort) from base_from_usda_fas_classify where parent_id=? and sort <> 0 `
 	err = o.Raw(sql, parentId).QueryRow(&sort)
 	return
 }
@@ -199,7 +199,7 @@ func DeleteUsdaFasClassifyByClassifyId(classifyIdList []int) (err error) {
 		return
 	}
 	//删除分类
-	sql := `DELETE FROM base_from_gpr_risk_classify WHERE classify_id IN (` + utils.GetOrmInReplace(num) + `) `
+	sql := `DELETE FROM base_from_usda_fas_classify WHERE classify_id IN (` + utils.GetOrmInReplace(num) + `) `
 	_, err = o.Raw(sql, classifyIdList).Exec()
 	return
 }
@@ -214,7 +214,7 @@ func AddUsdaFasClassifyMulti(list []*BaseFromUsdaFasClassify) (err error) {
 // InitUsdaFasClassifySort 初始化sort值
 func InitUsdaFasClassifySort() (err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := `UPDATE base_from_gpr_risk_classify 
+	sql := `UPDATE base_from_usda_fas_classify 
 SET modify_time=NOW(), sort = classify_id`
 	_, err = o.Raw(sql).Exec()
 	return
@@ -229,8 +229,8 @@ SELECT
 	c1.classify_id,
 	CONCAT( c2.classify_name, c1.classify_name ) AS type_name 
 FROM
-	base_from_gpr_risk_classify c1
-	LEFT JOIN base_from_gpr_risk_classify c2 ON c1.parent_id = c2.classify_id 
+	base_from_usda_fas_classify c1
+	LEFT JOIN base_from_usda_fas_classify c2 ON c1.parent_id = c2.classify_id 
 	) AS t ON CONCAT( s.type_2, s.type_3 ) = t.type_name
 	SET s.classify_id = t.classify_id, s.modify_time=NOW() where s.type_2 <>""`
 	_, err = o.Raw(sql).Exec()