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:08:02 +08:00
parent 08083d26d3
commit d544b7f80c
14 changed files with 338 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,18 +52,24 @@ func (c *EquipmentParams) isExist(iModel model2.IModel, tenantID uint64) (bool,
return count > 0, nil
}
func (c *Equipment) tree(src []*model2.ManageEquipment, parentID uint64) []*EquipmentInfo {
func (c *Equipment) tree(iModel model2.IModel, src []*model2.ManageEquipment, parentID uint64) []*EquipmentInfo {
out := make([]*EquipmentInfo, 0)
for _, v := range src {
if v.ParentID == parentID {
//parentID := "0"
//
//if v.ParentID > 0 {
// iModel.SetID(v.ParentID)
// parentID = iModel.GetEncodeID()
//}
out = append(out, &EquipmentInfo{
CommonIDString: basic.CommonIDString{ID: v.GetEncodeID()},
Code: v.Code,
Title: v.Title,
Image: v.Analysis(config.SettingInfo.Domain),
CreatedAt: v.CreatedAt,
Children: c.tree(src, v.ID),
Children: c.tree(iModel, src, v.ID),
})
}
}
@ -71,21 +77,17 @@ func (c *Equipment) tree(src []*model2.ManageEquipment, parentID uint64) []*Equi
}
// List 列表信息
func (c *Equipment) List(parentID uint64, title string, page, pageSize int) ([]*EquipmentInfo, error) {
func (c *Equipment) List(parentID uint64, title string) ([]*EquipmentInfo, error) {
mManageEquipment := model.NewManageEquipment()
out := make([]*model2.ManageEquipment, 0)
where := []*model2.ModelWhereOrder{
&model2.ModelWhereOrder{
Where: model2.NewWhere("parentID", parentID),
Order: model2.NewOrder("id", model2.OrderModeToDesc),
},
}
if parentID > 0 {
where = append(where, &model2.ModelWhereOrder{
Where: model2.NewWhere("parentID", parentID),
})
}
if title != "" {
where = append(where, &model2.ModelWhereOrder{
Where: model2.NewWhereLike("title", title),
@ -95,8 +97,7 @@ func (c *Equipment) List(parentID uint64, title string, page, pageSize int) ([]*
where...); err != nil {
return nil, err
}
return c.tree(out, 0), nil
return c.tree(mManageEquipment.ManageEquipment, out, 0), nil
}
// Detail 详细信息