批量修改

controllers/classify.go

@@ -677,6 +677,7 @@ func (this *ClassifyController) TelListClassify() {
 		condition += ` AND classify_name <> '晨报' AND classify_name <> '周报' `
 	}
 	telList, e := models.GetClassifyByCondition(condition, orderRule, pars)
+
 	if e != nil {
 		return
 	}

models/ai_predict_model/ai_predict_model_framework.go

@@ -309,8 +309,8 @@ type AiPredictModelFrameworkItem struct {
 	AdminName                 string                             `description:"创建人姓名"`
 	CreateTime                string                             `description:"创建时间"`
 	ModifyTime                string                             `description:"更新时间"`
-	Nodes                     []*AiPredictModelFrameworkNodeItem `description:"框架节点"`
-	Button                    AiPredictModelFrameworkItemButton  `description:"操作按钮"`
+	Nodes                     []*AiPredictModelFrameworkNodeItem `description:"框架节点" gorm:"-"`
+	Button                    AiPredictModelFrameworkItemButton  `description:"操作按钮" gorm:"-"`
 }
 
 // AiPredictModelFrameworkItemButton 操作按钮

models/cloud_disk_menu.go

@@ -43,7 +43,7 @@ func (m *CloudDiskMenu) GetItemByCondition(condition string, pars []interface{})
 	sql := `SELECT * FROM cloud_disk_menu WHERE 1=1 `
 	sql += condition
 	sql += ` LIMIT 1`
-	err = global.DEFAULT_DB.Raw(sql, pars).Find(&m).Error
+	err = global.DEFAULT_DB.Raw(sql, pars...).Find(&m).Error
 	return
 }
 

models/data_manage/base_from_baiinfo_classify.go

@@ -108,7 +108,7 @@ type BaseFromBaiinfoClassifyItems struct {
 	//UniqueCode         string                         `description:"唯一编码"`
 	//ModifyTime         time.Time                      `description:"修改时间"`
 	//CreateTime         time.Time                      `description:"创建时间"`
-	Children []*BaseFromBaiinfoClassifyItems `description:"下级"`
+	Children []*BaseFromBaiinfoClassifyItems `description:"下级" gorm:"-"`
 }
 
 type BaseFromBaiinfoClassifyNameItems struct {

models/data_manage/base_from_bloomberg_index.go

@@ -126,7 +126,7 @@ func (m *BaseFromBloombergIndex) GetItemByCondition(condition string, pars []int
 func (m *BaseFromBloombergIndex) GetCountByCondition(condition string, pars []interface{}) (count int, err error) {
 	sqlStr := fmt.Sprintf(`SELECT COUNT(1) FROM %s WHERE 1=1 %s`, m.TableName(), condition)
 	var totalNull sql.NullInt64
-	err = global.DbMap[utils.DbNameIndex].Raw(sqlStr, pars).Scan(&count).Error
+	err = global.DbMap[utils.DbNameIndex].Raw(sqlStr, pars...).Scan(&count).Error
 	if !totalNull.Valid {
 		count = 0
 	} else {

models/data_manage/base_from_business_data.go

@@ -148,7 +148,7 @@ func (m *BaseFromBusinessData) GetCountDataList(condition []string, pars []inter
 		sqlStr += ` WHERE ` + strings.Join(condition, " AND ")
 	}
 	var totalNull sql.NullInt64
-	err = global.DbMap[utils.DbNameIndex].Raw(sqlStr, pars).Scan(&totalNull).Error
+	err = global.DbMap[utils.DbNameIndex].Raw(sqlStr, pars...).Scan(&totalNull).Error
 	if !totalNull.Valid {
 		count = 0
 	} else {

models/data_manage/base_from_business_index.go

@@ -110,7 +110,7 @@ func (m *BaseFromBusinessIndex) GetListCount(condition string, pars []interface{
 		sqlStr += condition
 	}
 	var totalNull sql.NullInt64
-	err = global.DbMap[utils.DbNameIndex].Raw(sqlStr, pars).Scan(&totalNull).Error
+	err = global.DbMap[utils.DbNameIndex].Raw(sqlStr, pars...).Scan(&totalNull).Error
 	if !totalNull.Valid {
 		count = 0
 	} else {
@@ -213,8 +213,10 @@ func (m *BaseFromBusinessIndex) GeItemsByCondition(condition string, pars []inte
 		sql += " limit ? "
 		pars = append(pars, limitSize)
 	}
-
-	err = global.DbMap[utils.DbNameIndex].Raw(sql, utils.DATA_SOURCE_BUSINESS, pars).Find(&items).Error
+	pars = utils.ForwardPars(pars, utils.DATA_SOURCE_BUSINESS)
+	//err = global.DbMap[utils.DbNameIndex].Raw(sql, utils.DATA_SOURCE_BUSINESS, pars).Find(&items).Error
+	//pars = utils.ForwardPars(pars, utils.DATA_SOURCE_BUSINESS)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, pars...).Find(&items).Error
 
 	return
 }

models/data_manage/base_from_changes_visitors_covid.go

@@ -37,7 +37,6 @@ type BaseFromChangesVisitorsCovid struct {
 
 func GetVisitorsCovidList(day string) (list []*BaseFromChangesVisitorsCovid, err error) {
 	sql := ` SELECT * FROM base_from_changes_visitors_covid WHERE day=? `
-
 	sql += ` ORDER BY entity ASC `
 	err = global.DbMap[utils.DbNameIndex].Raw(sql, day).Find(&list).Error
 	return

models/data_manage/base_from_clarksons_index.go

@@ -91,7 +91,7 @@ func GetClarksonsIndexCountByCondition(condition string, pars []interface{}) (co
 	}
 	sqlStr += ` ORDER BY sort ASC, base_from_clarksons_index_id ASC`
 	var totalNull sql.NullInt64
-	err = global.DbMap[utils.DbNameIndex].Raw(sqlStr, pars).Scan(&totalNull).Error
+	err = global.DbMap[utils.DbNameIndex].Raw(sqlStr, pars...).Scan(&totalNull).Error
 	if !totalNull.Valid {
 		count = 0
 	} else {
@@ -109,7 +109,9 @@ func GetClarksonsIndexAndEdbInfoByCondition(condition string, pars []interface{}
 		sql += condition
 	}
 	sql += ` ORDER BY sort ASC `
-	err = global.DbMap[utils.DbNameIndex].Raw(sql, utils.DATA_SOURCE_SCI_HQ, pars).Find(&items).Error
+	pars = utils.ForwardPars(pars, utils.DATA_SOURCE_SCI_HQ)
+	//err = global.DbMap[utils.DbNameIndex].Raw(sql, utils.DATA_SOURCE_SCI_HQ, pars).Find(&items).Error
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, pars...).Find(&items).Error
 	return
 }
 
@@ -236,7 +238,7 @@ func GetClarksonsDataMaxCount(condition string, pars []interface{}) (count int,
 	sqlStr += ` GROUP BY a.base_from_clarksons_index_id) AS t `
 
 	var totalNull sql.NullInt64
-	err = global.DbMap[utils.DbNameIndex].Raw(sqlStr, pars).Scan(&totalNull).Error
+	err = global.DbMap[utils.DbNameIndex].Raw(sqlStr, pars...).Scan(&totalNull).Error
 	if !totalNull.Valid {
 		count = 0
 	} else {
@@ -399,7 +401,7 @@ func GetClarksonsIndexInfoCount(condition string, pars []interface{}) (count int
 		sqlStr += condition
 	}
 	var totalNull sql.NullInt64
-	err = global.DbMap[utils.DbNameIndex].Raw(sqlStr, pars).Scan(&totalNull).Error
+	err = global.DbMap[utils.DbNameIndex].Raw(sqlStr, pars...).Scan(&totalNull).Error
 	if !totalNull.Valid {
 		count = 0
 	} else {

models/data_manage/base_from_eia_stero.go

@@ -59,7 +59,7 @@ type BaseFromEiaSteoClassifyView struct {
 	ParentId                  int                            `description:"父级id"`
 	Level                     int                            `description:"层级"`
 	UniqueCode                string                         `description:"唯一编码"`
-	Child                     []*BaseFromEiaSteoClassifyView `description:"子级分类列表"`
+	Child                     []*BaseFromEiaSteoClassifyView `description:"子级分类列表" gorm:"-"`
 }
 
 // BaseFromEiaSteoData EiaSteo数据表

models/data_manage/base_from_hisugar.go

@@ -423,7 +423,7 @@ func GetHisugarIndexInfoPage(condition string, pars []interface{}, size int, pag
 // 获取所有分类
 func GetHisugarClassifyById(classifyId int) (ClassifyIds string, err error) {
 	o := global.DbMap[utils.DbNameIndex]
-	sql := fmt.Sprintf("SELECT %s AS classify_ids FROM base_from_hisugar_classify WHERE base_from_hisugar_classify_id=? OR parent_id=?", utils.GroupUnitFunc(utils.DbDriverName, "base_from_hisugar_classify_id", ",", ""))
+	sql := fmt.Sprintf("SELECT %s AS classify_ids FROM base_from_hisugar_classify WHERE base_from_hisugar_classify_id=? OR parent_id=?", utils.GroupUnitFunc(utils.DbDriverName, "base_from_hisugar_classify_id", ","))
 	//sql := ` SELECT GROUP_CONCAT(base_from_hisugar_classify_id) AS classify_ids FROM base_from_hisugar_classify WHERE base_from_hisugar_classify_id=? OR parent_id=?`
 	//sql := ` SELECT AS classify_ids FROM base_from_hisugar_classify WHERE base_from_hisugar_classify_id=? OR parent_id=?`
 	err = o.Raw(sql, classifyId, classifyId).Scan(&ClassifyIds).Error

models/data_manage/base_from_sci_classify.go

@@ -105,7 +105,7 @@ type BaseFromSciClassifyItems struct {
 	//UniqueCode         string                         `description:"唯一编码"`
 	//ModifyTime         time.Time                      `description:"修改时间"`
 	//CreateTime         time.Time                      `description:"创建时间"`
-	Children []*BaseFromSciClassifyItems `description:"下级"`
+	Children []*BaseFromSciClassifyItems `description:"下级" gorm:"-"'`
 }
 
 type BaseFromSciClassifyNameItems struct {

models/data_manage/base_from_smm_classify.go

@@ -105,7 +105,7 @@ type BaseFromSmmClassifyItems struct {
 	UniqueCode           string `description:"唯一编码"`
 	//ModifyTime         time.Time                      `description:"修改时间"`
 	//CreateTime         time.Time                      `description:"创建时间"`
-	Children []*BaseFromSmmClassifyItems `description:"下级"`
+	Children []*BaseFromSmmClassifyItems `description:"下级" gorm:"-"`
 }
 
 type BaseFromSmmClassifyNameItems struct {

models/data_manage/base_from_trade_index.go

@@ -631,7 +631,7 @@ type BaseFromTradeEicIndexV2 struct {
 	Parent                 string
 	CreateTime             time.Time
 	ModifyTime             time.Time
-	Children               []BaseFromTradeEicIndexV2
+	Children               []BaseFromTradeEicIndexV2 `gorm:"-"`
 }
 
 func GetEicDateV2() (date []*BaseFromTradeEicIndexV2, err error) {

models/data_manage/base_from_yongyi_classify.go

@@ -71,15 +71,15 @@ func UpdateBaseFromYongyiClassifySort(classifyId int) (err error) {
 }
 
 type BaseFromYongyiClassifyItems struct {
-	ClassifyId      int    `description:"分类ID"`
-	YongyiIndexId   int    `description:"指标类型ID"`
-	YongyiIndexCode string `description:"指标唯一编码"`
-	ClassifyName    string `description:"分类名称"`
-	UniqueCode      string `description:"分类唯一编码"`
-	ParentId        int    `description:"父级id"`
-	Level           int    `description:"层级"`
-	Sort            int    `description:"排序字段，越小越靠前，默认值：10"`
-	Children        []*BaseFromYongyiClassifyItems
+	ClassifyId      int                            `description:"分类ID"`
+	YongyiIndexId   int                            `description:"指标类型ID"`
+	YongyiIndexCode string                         `description:"指标唯一编码"`
+	ClassifyName    string                         `description:"分类名称"`
+	UniqueCode      string                         `description:"分类唯一编码"`
+	ParentId        int                            `description:"父级id"`
+	Level           int                            `description:"层级"`
+	Sort            int                            `description:"排序字段，越小越靠前，默认值：10"`
+	Children        []*BaseFromYongyiClassifyItems `grom:"-"`
 }
 
 type BaseFromYongyiClassifyNameItems struct {

models/data_manage/my_chart.go

@@ -470,7 +470,7 @@ func GetMyChartListByAdminId(adminId int) (item []*MyChartView, err error) {
 			LEFT JOIN  my_chart_classify_mapping AS b ON a.my_chart_id=b.my_chart_id AND a.admin_id=b.admin_id
 			LEFT JOIN my_chart_classify AS c ON b.my_chart_classify_id=c.my_chart_classify_id AND b.admin_id=c.admin_id
 			WHERE 1=1 AND a.admin_id=?
-			GROUP BY a.chart_info_id `, utils.GroupUnitFunc(utils.DbDriverName, "c.my_chart_classify_id", ",", ""))
+			GROUP BY a.chart_info_id `, utils.GroupUnitFunc(utils.DbDriverName, "c.my_chart_classify_id", ","))
 	err = o.Raw(sql, adminId).Find(&item).Error
 	return
 }

models/data_manage/mysteel_chemical_classify.go

@@ -109,8 +109,8 @@ type BaseFromMysteelChemicalClassifyItems struct {
 	UniqueCode                        string                                     `description:"唯一编码"`
 	ModifyTime                        time.Time                                  `description:"修改时间"`
 	CreateTime                        time.Time                                  `description:"创建时间"`
-	Button                            BaseFromMysteelChemicalClassifyItemsButton `description:"操作权限"`
-	Children                          []*BaseFromMysteelChemicalClassifyItems    `description:"下级"`
+	Button                            BaseFromMysteelChemicalClassifyItemsButton `description:"操作权限" gorm:"-"`
+	Children                          []*BaseFromMysteelChemicalClassifyItems    `description:"下级"  gorm:"-"`
 }
 
 type BaseFromMysteelChemicalClassifyItemsButton struct {

models/data_manage/supply_analysis/base_from_stock_plant_data.go

@@ -40,8 +40,8 @@ func GetVarietyEdbData(varietyEdbId int, startDate, endDate string) (items []*Ba
 	}
 
 	sql += ` ORDER BY data_time ASC `
-	o := orm.NewOrmUsingDB("data")
-	_, err = o.Raw(sql, varietyEdbId, pars).QueryRows(&items)
+	//o := orm.NewOrmUsingDB("data")
+	//_, err = o.Raw(sql, varietyEdbId, pars).QueryRows(&items)
 	err = global.DbMap[utils.DbNameIndex].Raw(sql, utils.ForwardPars(pars, varietyEdbId)...).Scan(&items).Error
 	return
 }

models/data_source/base_from_sci99.go

@@ -54,17 +54,17 @@ type BaseFromSci99DataItem struct {
 }
 
 type BaseFromSci99IndexList struct {
-	BaseFromSciIndexId int    `orm:"column(base_from_sci_index_id);pk" gorm:"primaryKey"` // 主键，自动递增
-	IndexCode          string // 指标编码
-	IndexName          string // 指标名称
-	ClassifyId         int    // 分类Id
-	Unit               string // 单位
-	Frequency          string // 频度
-	Describe           string // 指标描述
-	CreateTime         string // 创建时间
-	ModifyTime         string // 修改时间
-	DataList           []*BaseFromSci99DataItem
-	Paging             *paging.PagingItem `description:"分页数据"`
+	BaseFromSciIndexId int                      `orm:"column(base_from_sci_index_id);pk" gorm:"primaryKey"` // 主键，自动递增
+	IndexCode          string                   // 指标编码
+	IndexName          string                   // 指标名称
+	ClassifyId         int                      // 分类Id
+	Unit               string                   // 单位
+	Frequency          string                   // 频度
+	Describe           string                   // 指标描述
+	CreateTime         string                   // 创建时间
+	ModifyTime         string                   // 修改时间
+	DataList           []*BaseFromSci99DataItem `gorm:"-"`
+	Paging             *paging.PagingItem       `description:"分页数据" gorm:"-"`
 }
 
 // 添加数据

models/data_source/icpi.go

@@ -58,18 +58,18 @@ type BaseFromIcpiDataView struct {
 }
 
 type BaseFromIcpiIndexView struct {
-	BaseFromIcpiIndexId    int    `description:"指标id"`
-	BaseFromIcpiClassifyId int    `description:"分类id"`
-	IndexCode              string `description:"指标编码"`
-	IndexName              string `description:"指标名称"`
-	Frequency              string `description:"频度"`
-	Unit                   string `description:"单位"`
-	StartDate              string `description:"开始日期"`
-	EndDate                string `description:"结束日期"`
-	CreateTime             string `description:"创建时间"`
-	ModifyTime             string `description:"修改时间"`
-	DataList               []*BaseFromIcpiDataView
-	Paging                 *paging.PagingItem `description:"分页数据"`
+	BaseFromIcpiIndexId    int                     `description:"指标id"`
+	BaseFromIcpiClassifyId int                     `description:"分类id"`
+	IndexCode              string                  `description:"指标编码"`
+	IndexName              string                  `description:"指标名称"`
+	Frequency              string                  `description:"频度"`
+	Unit                   string                  `description:"单位"`
+	StartDate              string                  `description:"开始日期"`
+	EndDate                string                  `description:"结束日期"`
+	CreateTime             string                  `description:"创建时间"`
+	ModifyTime             string                  `description:"修改时间"`
+	DataList               []*BaseFromIcpiDataView `gorm:"-"`
+	Paging                 *paging.PagingItem      `description:"分页数据" gorm:"-"`
 }
 
 func (obj *BaseFromIcpiIndex) GetIcpiIndex(condition string, pars interface{}) (items []*BaseFromIcpiIndexView, err error) {

models/en_company_permission.go

@@ -102,7 +102,7 @@ func (m *EnCompanyPermission) GetPageItemsByCondition(startSize, pageSize int, c
 
 	totalSql := `SELECT COUNT(1) total FROM (` + sql + `) z`
 	var totalNull sql2.NullInt64
-	err = global.DbMap[utils.DbNameReport].Raw(totalSql, pars).Scan(&totalNull).Error
+	err = global.DbMap[utils.DbNameReport].Raw(totalSql, pars...).Scan(&totalNull).Error
 	if err != nil {
 		return
 	}

models/en_permission.go

@@ -115,7 +115,7 @@ func (m *EnPermission) GetPageItemsByCondition(startSize, pageSize int, conditio
 
 	totalSql := `SELECT COUNT(1) total FROM (` + sql + `) z`
 	var totalNull sql2.NullInt64
-	err = global.DbMap[utils.DbNameReport].Raw(totalSql, pars).Scan(&totalNull).Error
+	err = global.DbMap[utils.DbNameReport].Raw(totalSql, pars...).Scan(&totalNull).Error
 	if err != nil {
 		return
 	}

utils/sql.go

@@ -18,7 +18,7 @@ var supportDriverMap = map[string]Driver{
 	"dm":    DM,
 }
 
-func GroupUnitFunc(driver string, column, delimiter, tableAlia string) (sqlStr string) {
+func GroupUnitFunc(driver string, column, delimiter string) (sqlStr string) {
 	dbDriver, _ := getDriverInstance(driver)
 	if delimiter == "" {
 		delimiter = ","
@@ -26,9 +26,9 @@ func GroupUnitFunc(driver string, column, delimiter, tableAlia string) (sqlStr s
 	if column == "" {
 		column = "[UNKNOWN COLUMN]"
 	}
-	if tableAlia != "" {
-		column = fmt.Sprintf("%s.%s", tableAlia, column)
-	}
+	//if tableAlia != "" {
+	//	column = fmt.Sprintf("%s.%s", tableAlia, column)
+	//}
 	switch dbDriver {
 	case MySql:
 		sqlStr = fmt.Sprintf("GROUP_CONCAT(%s SEPARATOR '%s')", column, delimiter)
@@ -40,6 +40,27 @@ func GroupUnitFunc(driver string, column, delimiter, tableAlia string) (sqlStr s
 	return sqlStr
 }
 
+func GroupUnitDistinctFunc(driver string, column, delimiter string) (sqlStr string) {
+	dbDriver, _ := getDriverInstance(driver)
+	if delimiter == "" {
+		delimiter = ","
+	}
+	if column == "" {
+		column = "[UNKNOWN COLUMN]"
+	}
+	//if tableAlia != "" {
+	//	column = fmt.Sprintf("%s.%s", tableAlia, column)
+	//}
+	switch dbDriver {
+	case MySql:
+		sqlStr = fmt.Sprintf("GROUP_CONCAT(DISTINCT %s SEPARATOR '%s')", column, delimiter)
+	case DM:
+		sqlStr = fmt.Sprintf("LISTAGG(DISTINCT %s, '%s') WITHIN GROUP (ORDER BY %s)", column, delimiter, column)
+	default:
+		sqlStr = fmt.Sprintf("GROUP_CONCAT(DISTINCT  %s SEPARATOR '%s')", column, delimiter) // 默认使用 MySQL 的语法
+	}
+	return sqlStr
+}
 func getDriverInstance(driver string) (dbDriver Driver, err error) {
 	if driver == "" {
 		dbDriver = supportDriverMap[DbDriverName]