feat：优化项目信息，增加用户器材信息管理
This commit is contained in:
henry
@ -98,6 +98,8 @@ func (c *Enterprise) Form(params *EnterpriseParams) error {
|
||||
if mUserCooperateEnterprise.ID > 0 {
|
||||
return model2.Updates(mUserCooperateEnterprise.UserCooperateEnterprise, mUserCooperateEnterprise.UserCooperateEnterprise)
|
||||
}
|
||||
mUserCooperateEnterprise.Local.Local = c.local
|
||||
mUserCooperateEnterprise.UID = c.UID
|
||||
return model2.Create(mUserCooperateEnterprise.UserCooperateEnterprise)
|
||||
}
|
||||
|
||||
|
||||
126
app/api/enterprise/controller/manage/equipment.go
Normal file
126
app/api/enterprise/controller/manage/equipment.go
Normal file
@ -0,0 +1,126 @@
|
||||
package manage
|
||||
|
||||
import (
|
||||
"SciencesServer/app/api/enterprise/model"
|
||||
"SciencesServer/app/basic/controller"
|
||||
model2 "SciencesServer/app/common/model"
|
||||
"SciencesServer/app/session"
|
||||
"errors"
|
||||
)
|
||||
|
||||
// Equipment 设备信息
|
||||
type Equipment struct {
|
||||
*session.Enterprise
|
||||
local string
|
||||
}
|
||||
|
||||
type EquipmentHandle func(session *session.Enterprise, local string) *Equipment
|
||||
|
||||
type (
|
||||
EquipmentInfo struct {
|
||||
ID string `json:"id"`
|
||||
*model2.ManageEquipment
|
||||
}
|
||||
EquipmentParams struct {
|
||||
ID uint64
|
||||
Kind int
|
||||
Code, Title, Params, Description string
|
||||
PurchaseAt string
|
||||
}
|
||||
)
|
||||
|
||||
// List 列表信息
|
||||
func (c *Equipment) List(kind int, code, title string, page, pageSize int) (*controller.ReturnPages, error) {
|
||||
mManageEquipment := model.NewManageEquipment()
|
||||
|
||||
where := []*model2.ModelWhereOrder{
|
||||
&model2.ModelWhereOrder{
|
||||
Where: model2.NewWhere("local", c.local),
|
||||
Order: model2.NewOrder("id", model2.OrderModeToDesc),
|
||||
},
|
||||
&model2.ModelWhereOrder{
|
||||
Where: model2.NewWhere("uid", c.UID),
|
||||
},
|
||||
}
|
||||
if kind > 0 {
|
||||
where = append(where, &model2.ModelWhereOrder{Where: model2.NewWhere("kind", kind)})
|
||||
}
|
||||
if code != "" {
|
||||
where = append(where, &model2.ModelWhereOrder{Where: model2.NewWhereLike("code", code)})
|
||||
}
|
||||
if title != "" {
|
||||
where = append(where, &model2.ModelWhereOrder{Where: model2.NewWhereLike("title", title)})
|
||||
}
|
||||
out := make([]*model2.ManageEquipment, 0)
|
||||
|
||||
var count int64
|
||||
|
||||
if err := model2.Pages(mManageEquipment.ManageEquipment, &out, page, pageSize, &count, where...); 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
|
||||
}
|
||||
|
||||
// Form 数据操作
|
||||
func (c *Equipment) Form(params *EquipmentParams) error {
|
||||
mManageEquipment := model.NewManageEquipment()
|
||||
|
||||
if params.ID > 0 {
|
||||
mManageEquipment.ID = params.ID
|
||||
|
||||
isExist, err := model2.FirstField(mManageEquipment.ManageEquipment, []string{"id", "uid", "created_at"})
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
} else if !isExist {
|
||||
return errors.New("操作错误，器材信息不存在或已被删除")
|
||||
} else if mManageEquipment.UID != c.UID {
|
||||
return errors.New("无权限操作")
|
||||
}
|
||||
}
|
||||
mManageEquipment.Kind = model2.ManageEquipmentKind(params.Kind)
|
||||
mManageEquipment.Code = params.Code
|
||||
mManageEquipment.Title = params.Title
|
||||
mManageEquipment.Params = params.Params
|
||||
mManageEquipment.Description = params.Description
|
||||
|
||||
if mManageEquipment.ID > 0 {
|
||||
return model2.Updates(mManageEquipment.ManageEquipment, mManageEquipment.ManageEquipment)
|
||||
}
|
||||
mManageEquipment.Local.Local = c.local
|
||||
mManageEquipment.UID = c.UID
|
||||
return model2.Create(mManageEquipment.ManageEquipment)
|
||||
}
|
||||
|
||||
// Delete 删除操作
|
||||
func (c *Equipment) Delete(id uint64) error {
|
||||
mManageEquipment := model.NewManageEquipment()
|
||||
mManageEquipment.ID = id
|
||||
|
||||
isExist, err := model2.FirstField(mManageEquipment.ManageEquipment, []string{"id", "uid", "created_at"})
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
} else if !isExist {
|
||||
return errors.New("操作错误，器材信息不存在或已被删除")
|
||||
} else if mManageEquipment.UID != c.UID {
|
||||
return errors.New("无权限操作")
|
||||
}
|
||||
return model2.Delete(mManageEquipment.ManageEquipment)
|
||||
}
|
||||
|
||||
func NewEquipment() EquipmentHandle {
|
||||
return func(session *session.Enterprise, local string) *Equipment {
|
||||
return &Equipment{
|
||||
Enterprise: session,
|
||||
local: local,
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,113 +0,0 @@
|
||||
package technology
|
||||
|
||||
import (
|
||||
"SciencesServer/app/api/enterprise/model"
|
||||
"SciencesServer/app/api/manage/controller"
|
||||
model2 "SciencesServer/app/common/model"
|
||||
"SciencesServer/app/session"
|
||||
"errors"
|
||||
)
|
||||
|
||||
// Equipment 技术设备
|
||||
type Equipment struct {
|
||||
*session.Enterprise
|
||||
local string
|
||||
}
|
||||
|
||||
type EquipmentHandle func(session *session.Enterprise, local string) *Equipment
|
||||
|
||||
type EquipmentParams struct {
|
||||
ID uint64
|
||||
Title, Research, Describe string
|
||||
}
|
||||
|
||||
type EquipmentInfo struct {
|
||||
ID string `json:"id"`
|
||||
*model2.TechnologyEquipment
|
||||
}
|
||||
|
||||
// List 列表信息
|
||||
func (c *Equipment) List(title string, page, pageSize int) (*controller.ReturnPages, error) {
|
||||
mTechnologyEquipment := model.NewTechnologyEquipment()
|
||||
|
||||
where := []*model2.ModelWhereOrder{&model2.ModelWhereOrder{
|
||||
Where: model2.NewWhere("local", c.local),
|
||||
Order: model2.NewOrder("id", model2.OrderModeToDesc),
|
||||
}, &model2.ModelWhereOrder{
|
||||
Where: model2.NewWhere("uid", c.UID),
|
||||
}}
|
||||
|
||||
if title != "" {
|
||||
where = append(where, &model2.ModelWhereOrder{
|
||||
Where: model2.NewWhereLike("title", title),
|
||||
})
|
||||
}
|
||||
out := make([]*model2.TechnologyEquipment, 0)
|
||||
|
||||
var count int64
|
||||
|
||||
if err := model2.Pages(mTechnologyEquipment.TechnologyEquipment, &out, page, pageSize, &count, where...); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
list := make([]*EquipmentInfo, 0)
|
||||
|
||||
for _, v := range out {
|
||||
list = append(list, &EquipmentInfo{
|
||||
ID: v.GetEncodeID(), TechnologyEquipment: v,
|
||||
})
|
||||
}
|
||||
return &controller.ReturnPages{Data: list, Count: count}, nil
|
||||
}
|
||||
|
||||
func (c *Equipment) Form(params *EquipmentParams) error {
|
||||
mTechnologyEquipment := model.NewTechnologyEquipment()
|
||||
|
||||
if params.ID > 0 {
|
||||
mTechnologyEquipment.ID = params.ID
|
||||
|
||||
isExist, err := model2.First(mTechnologyEquipment.TechnologyEquipment)
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
} else if !isExist {
|
||||
return errors.New("操作错误，设备信息不存在")
|
||||
} else if mTechnologyEquipment.Local.Local != c.local {
|
||||
return errors.New("无权限操作")
|
||||
}
|
||||
}
|
||||
mTechnologyEquipment.Title = params.Title
|
||||
mTechnologyEquipment.Research = params.Research
|
||||
mTechnologyEquipment.Describe = params.Describe
|
||||
|
||||
if mTechnologyEquipment.ID > 0 {
|
||||
return model2.Updates(mTechnologyEquipment.TechnologyEquipment, mTechnologyEquipment.TechnologyEquipment)
|
||||
}
|
||||
mTechnologyEquipment.UID = c.UID
|
||||
return model2.Create(mTechnologyEquipment.TechnologyEquipment)
|
||||
}
|
||||
|
||||
// Delete 删除操作
|
||||
func (c *Equipment) Delete(id uint64) error {
|
||||
mTechnologyEquipment := model.NewTechnologyEquipment()
|
||||
mTechnologyEquipment.ID = id
|
||||
|
||||
isExist, err := model2.First(mTechnologyEquipment.TechnologyEquipment)
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
} else if !isExist {
|
||||
return errors.New("操作错误，设备信息不存在或已被删除")
|
||||
} else if mTechnologyEquipment.UID != c.UID {
|
||||
return errors.New("无权限操作")
|
||||
}
|
||||
return model2.Delete(mTechnologyEquipment.TechnologyEquipment)
|
||||
}
|
||||
|
||||
func NewEquipment() EquipmentHandle {
|
||||
return func(session *session.Enterprise, local string) *Equipment {
|
||||
return &Equipment{
|
||||
Enterprise: session,
|
||||
local: local,
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -44,7 +44,7 @@ func (c *Bank) List() ([]*BankInfo, error) {
|
||||
out := make([]*model2.UserManageBank, 0)
|
||||
|
||||
where := []*model2.ModelWhereOrder{&model2.ModelWhereOrder{
|
||||
Where: model2.NewWhere("uid", c.ManageUID),
|
||||
Where: model2.NewWhere("uid", c.UID),
|
||||
Order: model2.NewOrder("is_default", model2.OrderModeToDesc),
|
||||
}}
|
||||
if err := model2.Find(mUserManageBank.UserManageBank, &out, where...); err != nil {
|
||||
@ -84,13 +84,13 @@ func (c *Bank) Bind(params *BankParams, captcha string) error {
|
||||
} else if count > 0 {
|
||||
return errors.New("当前银行卡已被注册")
|
||||
}
|
||||
mUserManageBank.MUid = c.ManageUID
|
||||
mUserManageBank.UID = c.UID
|
||||
mUserManageBank.Name = params.Name
|
||||
mUserManageBank.IDCard = params.IDCard
|
||||
mUserManageBank.BankCard = params.BankCard
|
||||
mUserManageBank.BankName = params.BankName
|
||||
|
||||
if err = model2.Count(mUserManageBank.UserManageBank, &count, model2.NewWhere("uid", c.ManageUID)); err != nil {
|
||||
if err = model2.Count(mUserManageBank.UserManageBank, &count, model2.NewWhere("uid", c.UID)); err != nil {
|
||||
return err
|
||||
} else if count <= 0 {
|
||||
mUserManageBank.IsDefault = model2.UserManageBankDefaultForYes
|
||||
@ -109,7 +109,7 @@ func (c *Bank) Unbind(id uint64) error {
|
||||
return err
|
||||
} else if !isExist {
|
||||
return errors.New("操作错误，绑定信息不存在")
|
||||
} else if mUserManageBank.MUid != c.ManageUID {
|
||||
} else if mUserManageBank.UID != c.UID {
|
||||
return errors.New("无权限操作")
|
||||
}
|
||||
return model2.Delete(mUserManageBank)
|
||||
|
||||
Reference in New Issue
Block a user