daihengshun/ArmedPolice
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat：完善项目

Browse Source
This commit is contained in:
henry
2021-11-09 14:42:16 +08:00
parent d544b7f80c
commit be0ef1a1d0
5 changed files with 512 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/controller/manage/equipment.go
View File

@ -77,14 +77,14 @@ func (c *Equipment) tree(iModel model2.IModel, src []*model2.ManageEquipment, pa
}
// List 列表信息
func (c *Equipment) List(parentID uint64, title string) ([]*EquipmentInfo, error) {
func (c *Equipment) List(parentID uint64, title string, page, pageSize int) (*basic.PageDataResponse, error) {
mManageEquipment := model.NewManageEquipment()
out := make([]*model2.ManageEquipment, 0)
where := []*model2.ModelWhereOrder{
&model2.ModelWhereOrder{
Where: model2.NewWhere("parentID", parentID),
Where: model2.NewWhere("parent_id", parentID),
Order: model2.NewOrder("id", model2.OrderModeToDesc),
},
}
@ -93,11 +93,20 @@ func (c *Equipment) List(parentID uint64, title string) ([]*EquipmentInfo, error
Where: model2.NewWhereLike("title", title),
})
}
if err := model2.ScanFields(mManageEquipment.ManageEquipment, &out, []string{"id", "code", "title", "image", "created_at"},
where...); err != nil {
//if err := model2.ScanFields(mManageEquipment.ManageEquipment, &out, []string{"id", "code", "title", "image", "created_at"},
// where...); err != nil {
// return nil, err
//}
var count int64
if err := model2.PagesFields(mManageEquipment.ManageEquipment, &out, []string{"id", "code", "title", "image", "created_at"},
page, pageSize, &count, where...); err != nil {
return nil, err
}
return c.tree(mManageEquipment.ManageEquipment, out, 0), nil
return &basic.PageDataResponse{
Data: c.tree(mManageEquipment.ManageEquipment, out, 0),
Count: count,
}, nil
}
// Detail 详细信息