lbsadmin
/
bee
mirror of https://github.com/beego/bee.git
1
0
Fork 0
Code Issues Releases Activity

Merge c9443f4ca3 into 9db35a8270

This commit is contained in:
吴文豪 2017-03-08 03:32:12 +00:00 committed by GitHub
parent 9db35a8270 c9443f4ca3
commit e7f0f744b5
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
g_appcode.go
View File

@ -1032,7 +1032,7 @@ func Get{{modelName}}ById(id int) (v *{{modelName}}, err error) {
// GetAll{{modelName}} retrieves all {{modelName}} matches certain condition. Returns empty list if
// no records exist
func GetAll{{modelName}}(query map[string]string, fields []string, sortby []string, order []string,
offset int64, limit int64) (ml []interface{}, err error) {
offset int64, limit int64) (ml map[string]interface{}, err error) {
o := orm.NewOrm()
qs := o.QueryTable(new({{modelName}}))
// query k=v
@ -1086,10 +1086,17 @@ func GetAll{{modelName}}(query map[string]string, fields []string, sortby []stri
var l []{{modelName}}
qs = qs.OrderBy(sortFields...)
total, err := qs.Count()
if err != nil {
panic(err)
}
if _, err = qs.Limit(limit, offset).All(&l, fields...); err == nil {
var result []interface{}
if len(fields) == 0 {
for _, v := range l {
ml = append(ml, v)
result = append(result, v)
}
} else {
// trim unused fields
@ -1099,9 +1106,13 @@ func GetAll{{modelName}}(query map[string]string, fields []string, sortby []stri
for _, fname := range fields {
m[fname] = val.FieldByName(fname).Interface()
}
ml = append(ml, m)
result = append(result, m)
}
}
var ml map[string]interface{} = make(map[string]interface{})
ml["result"] = result
ml["total"] = total
return ml, nil
}
return nil, err

16
g_model.go
View File

@ -172,7 +172,7 @@ func Get{{modelName}}ById(id int64) (v *{{modelName}}, err error) {
// GetAll{{modelName}} retrieves all {{modelName}} matches certain condition. Returns empty list if
// no records exist
func GetAll{{modelName}}(query map[string]string, fields []string, sortby []string, order []string,
offset int64, limit int64) (ml []interface{}, err error) {
offset int64, limit int64) (ml map[string]interface{}, err error) {
o := orm.NewOrm()
qs := o.QueryTable(new({{modelName}}))
// query k=v
@ -222,10 +222,17 @@ func GetAll{{modelName}}(query map[string]string, fields []string, sortby []stri
var l []{{modelName}}
qs = qs.OrderBy(sortFields...)
total, err := qs.Count()
if err != nil {
panic(err)
}
if _, err = qs.Limit(limit, offset).All(&l, fields...); err == nil {
var result []interface{}
if len(fields) == 0 {
for _, v := range l {
ml = append(ml, v)
result = append(result, v)
}
} else {
// trim unused fields
@ -235,9 +242,12 @@ func GetAll{{modelName}}(query map[string]string, fields []string, sortby []stri
for _, fname := range fields {
m[fname] = val.FieldByName(fname).Interface()
}
ml = append(ml, m)
result = append(result, m)
}
}
var ml map[string]interface{} = make(map[string]interface{})
ml["result"] = result
ml["total"] = total
return ml, nil
}
return nil, err