批量修改

controllers/data_manage/yongyi_data.go

@@ -980,9 +980,10 @@ func (this *EdbInfoController) ExportYongyiList() {
 
 		if len(childClassify) > 0 {
 			condition += `AND classify_id IN (` + utils.GetOrmInReplace(len(childClassify)) + `)`
-			for _, child := range childClassify {
-				pars = append(pars, child.ClassifyId)
-			}
+			//for _, child := range childClassify {
+			//	pars = append(pars, child.ClassifyId)
+			//}
+			pars = append(pars, childClassify)
 		} else {
 			condition += ` AND classify_id=?`
 			pars = append(pars, classifyId)

models/data_manage/base_from_baiinfo.go

@@ -52,7 +52,7 @@ func GetBaseFromBaiinfoByBaiinfoCode(baiinfoCode string) (item *BaseFromBaiinfo,
 }
 
 type BaseFromBaiinfoIndex struct {
-	BaseFromBaiinfoIndexId int `orm:"column(base_from_baiinfo_index_id);pk"`
+	BaseFromBaiinfoIndexId int `gorm:"column:base_from_baiinfo_index_id;primaryKey"`
 	ClassifyId             int
 	Interface              string
 	IndexCode              string
@@ -248,7 +248,7 @@ func GetFirstBaseFromBaiinfoIndexByClassifyId(classifyId int) (item *BaseFromBai
 
 // Update 更新Baiinfo指标基础信息
 func (item *BaseFromBaiinfoIndex) Update(cols []string) (err error) {
-	err = global.DbMap[utils.DbNameIndex].Select(cols).Updates(item).Error
+	err = global.DbMap[utils.DbNameIndex].Select(cols).Updates(&item).Error
 	return
 }
 

models/data_manage/base_from_yongyi.go

@@ -22,7 +22,7 @@ type BaseFromYongyiIndex struct {
 }
 
 type BaseFromYongyiIndexList struct {
-	YongyiIndexId int `orm:"column(yongyi_index_id);pk"`
+	YongyiIndexId int `gorm:"column:yongyi_index_id;primaryKey"`
 	ClassifyId    int
 	Interface     string
 	EdbInfoId     int
@@ -147,11 +147,16 @@ func GetYongyiDataDataTimeByIndexId(indexIdList []int) (items []string, err erro
 	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT DISTINCT data_time FROM base_from_yongyi_data WHERE yongyi_index_id IN (` + utils.GetOrmInReplace(len(indexIdList)) + `) ORDER BY data_time DESC`
 	err = o.Raw(sql, indexIdList).Find(&items).Error
+	if utils.NeedDateOrTimeFormat(utils.DbDriverName) {
+		for i := range items {
+			items[i] = utils.GormDateStrToDateStr(items[i])
+		}
+	}
 	return
 }
 
 type BaseFromYongyiData struct {
-	YongyiDataId  int `orm:"column(yongyi_data_id);pk" gorm:"primaryKey"`
+	YongyiDataId  int `gorm:"column:yongyi_data_id;primaryKey"`
 	YongyiIndexId int
 	IndexCode     string
 	DataTime      string
@@ -177,7 +182,7 @@ func (m *BaseFromYongyiData) AfterFind(tx *gorm.DB) (err error) {
 }
 
 type BaseFromYongyiIndexSearchItem struct {
-	YongyiIndexId    int `orm:"column(yongyi_index_id);pk" gorm:"primaryKey"`
+	YongyiIndexId    int `gorm:"column:yongyi_index_id;primaryKey"`
 	ClassifyId       int
 	ParentClassifyId int
 	IndexCode        string