feat:完善项目信息
This commit is contained in:
@ -45,6 +45,10 @@ type (
|
||||
Patent []*technology.PatentInfo `json:"patent"`
|
||||
Paper []*technology.PaperInfo `json:"paper"`
|
||||
}
|
||||
EquipmentInfo struct {
|
||||
ID string `json:"id"`
|
||||
*model2.ManageEquipment
|
||||
}
|
||||
)
|
||||
|
||||
// achievement 技术成果信息
|
||||
@ -222,3 +226,28 @@ func cooperateDetail(id uint64) (*CooperateDetailInfo, error) {
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// equipment 设备信息
|
||||
func equipment(kind model2.ManageEquipmentKind, uids []uint64, page, pageSize int) (*controller.ReturnPages, error) {
|
||||
mManageEquipment := model.NewManageEquipment()
|
||||
|
||||
out := make([]*model2.ManageEquipment, 0)
|
||||
|
||||
var count int64
|
||||
|
||||
if err := model2.Pages(mManageEquipment.ManageEquipment, &out, page, pageSize, &count, &model2.ModelWhereOrder{
|
||||
Where: model2.NewWhere("kind", kind),
|
||||
Order: model2.NewOrder("id", model2.OrderModeToDesc),
|
||||
}, &model2.ModelWhereOrder{Where: model2.NewWhereIn("uid", uids)}); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
list := make([]*EquipmentInfo, 0)
|
||||
|
||||
for _, v := range out {
|
||||
list = append(list, &EquipmentInfo{
|
||||
ID: v.GetEncodeID(),
|
||||
ManageEquipment: v,
|
||||
})
|
||||
}
|
||||
return &controller.ReturnPages{Data: list, Count: count}, nil
|
||||
}
|
||||
|
Reference in New Issue
Block a user