|
@@ -1,7 +1,7 @@
|
|
|
package excel
|
|
|
|
|
|
import (
|
|
|
- "github.com/beego/beego/v2/client/orm"
|
|
|
+ "eta/eta_index_lib/global"
|
|
|
"time"
|
|
|
)
|
|
|
|
|
@@ -35,7 +35,6 @@ type ExcelInfo struct {
|
|
|
|
|
|
// GetNoContentExcelInfoAll 获取不含content的表格列表 用于分类展示
|
|
|
func GetNoContentExcelInfoAll(source, userId int) (items []*ExcelClassifyItems, err error) {
|
|
|
- o := orm.NewOrm()
|
|
|
sql := ` SELECT excel_info_id,excel_classify_id,excel_name AS excel_classify_name,
|
|
|
unique_code,sys_user_id,sys_user_real_name
|
|
|
FROM excel_info where is_delete=0 AND source = ? `
|
|
@@ -47,24 +46,24 @@ func GetNoContentExcelInfoAll(source, userId int) (items []*ExcelClassifyItems,
|
|
|
pars = append(pars, userId)
|
|
|
}
|
|
|
sql += ` ORDER BY sort asc,create_time desc `
|
|
|
- _, err = o.Raw(sql, pars...).QueryRows(&items)
|
|
|
+ err = global.DEFAULT_DB.Raw(sql, pars...).Scan(&items).Error
|
|
|
+
|
|
|
return
|
|
|
}
|
|
|
|
|
|
// UpdateExcelInfoClassifyId 更改表格分类
|
|
|
func UpdateExcelInfoClassifyId(classifyId, excelInfoId int) (err error) {
|
|
|
- o := orm.NewOrm()
|
|
|
sql := ` update excel_info set excel_classify_id = ? WHERE excel_info_id=? `
|
|
|
- _, err = o.Raw(sql, classifyId, excelInfoId).Exec()
|
|
|
+ err = global.DEFAULT_DB.Exec(sql, classifyId, excelInfoId).Error
|
|
|
|
|
|
return
|
|
|
}
|
|
|
|
|
|
// GetAllExcelInfoBySource 根据来源获取包含content的表格列表
|
|
|
func GetAllExcelInfoBySource(source int) (items []*ExcelInfo, err error) {
|
|
|
- o := orm.NewOrm()
|
|
|
sql := ` SELECT * FROM excel_info where is_delete=0 AND source = ? ORDER BY sort asc,create_time desc `
|
|
|
- _, err = o.Raw(sql, source).QueryRows(&items)
|
|
|
+ err = global.DEFAULT_DB.Raw(sql, source).Find(&items).Error
|
|
|
+
|
|
|
return
|
|
|
}
|
|
|
|
|
@@ -121,14 +120,14 @@ type MixedTableCellDataReq struct {
|
|
|
}
|
|
|
|
|
|
func (m *ExcelInfo) Update(cols []string) (err error) {
|
|
|
- o := orm.NewOrm()
|
|
|
- _, err = o.Update(m, cols...)
|
|
|
+ err = global.DEFAULT_DB.Select(cols).Updates(m).Error
|
|
|
+
|
|
|
return
|
|
|
}
|
|
|
|
|
|
func (m *ExcelInfo) GetItemById(id int) (item *ExcelInfo, err error) {
|
|
|
- o := orm.NewOrm()
|
|
|
sql := `SELECT * FROM excel_info WHERE excel_info_id = ? LIMIT 1`
|
|
|
- err = o.Raw(sql, id).QueryRow(&item)
|
|
|
+ err = global.DEFAULT_DB.Raw(sql, id).First(&item).Error
|
|
|
+
|
|
|
return
|
|
|
}
|