feat:完善项目信息
This commit is contained in:
@ -5,6 +5,7 @@ import (
|
||||
"SciencesServer/app/basic/controller"
|
||||
model2 "SciencesServer/app/common/model"
|
||||
"SciencesServer/app/session"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// Consume 消耗日志
|
||||
@ -16,14 +17,15 @@ type Consume struct {
|
||||
type ConsumeHandle func(session *session.Enterprise, local string) *Consume
|
||||
|
||||
type (
|
||||
// ConsumeInfo 消耗日志信息
|
||||
ConsumeInfo struct {
|
||||
ID string `json:"id"`
|
||||
*model2.UserConsume
|
||||
}
|
||||
)
|
||||
|
||||
// List 列表信息
|
||||
func (c *Consume) List(source, page, pageSize int) (*controller.ReturnPages, error) {
|
||||
// Instance 列表信息
|
||||
func (c *Consume) Instance(source int, createdAt string, page, pageSize int) (*controller.ReturnPages, error) {
|
||||
mUserConsume := model.NewUserConsume()
|
||||
|
||||
where := []*model2.ModelWhereOrder{
|
||||
@ -32,6 +34,18 @@ func (c *Consume) List(source, page, pageSize int) (*controller.ReturnPages, err
|
||||
Order: model2.NewOrder("id", model2.OrderModeToDesc),
|
||||
},
|
||||
}
|
||||
if source > 0 {
|
||||
where = append(where, &model2.ModelWhereOrder{Where: model2.NewWhere("source", source)})
|
||||
}
|
||||
if createdAt != "" {
|
||||
_wheres := model2.NewWhereSectionAt("created_at", strings.Split(createdAt, " ~ "))
|
||||
|
||||
where = append(where, &model2.ModelWhereOrder{
|
||||
Where: _wheres[0],
|
||||
}, &model2.ModelWhereOrder{
|
||||
Where: _wheres[1],
|
||||
})
|
||||
}
|
||||
out := make([]*model2.UserConsume, 0)
|
||||
|
||||
var count int64
|
||||
@ -39,6 +53,7 @@ func (c *Consume) List(source, page, pageSize int) (*controller.ReturnPages, err
|
||||
if err := model2.Pages(mUserConsume.UserConsume, &out, page, pageSize, &count, where...); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
list := make([]*ConsumeInfo, 0)
|
||||
|
||||
for _, v := range out {
|
||||
@ -50,6 +65,13 @@ func (c *Consume) List(source, page, pageSize int) (*controller.ReturnPages, err
|
||||
return &controller.ReturnPages{Data: list, Count: count}, nil
|
||||
}
|
||||
|
||||
// Delete 删除操作
|
||||
func (c *Consume) Delete(id uint64) error {
|
||||
mUserConsume := model.NewUserConsume()
|
||||
mUserConsume.ID = id
|
||||
return model2.Delete(mUserConsume.UserConsume)
|
||||
}
|
||||
|
||||
func NewConsume() ConsumeHandle {
|
||||
return func(session *session.Enterprise, local string) *Consume {
|
||||
return &Consume{
|
||||
|
Reference in New Issue
Block a user