williamet/cas_tt_cloud_backend
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat：优化项目信息

Browse Source
This commit is contained in:
henry
2021-11-30 16:28:07 +08:00
parent 5bab79a613
commit d2fb5849c3
8 changed files with 31 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/api/enterprise/controller/technology/instance.go
View File

@ -44,6 +44,8 @@ func (c *Instance) List(status, page, pageSize int) (*controller.ReturnPages, er
where := []*model2.ModelWhereOrder{&model2.ModelWhereOrder{
Where: model2.NewWhere("status", status),
Order: model2.NewOrder("id", model2.OrderModeToDesc),
}, &model2.ModelWhereOrder{
Where: model2.NewWhere("uid", c.UID),
}}
var count int64
@ -68,14 +70,13 @@ func (c *Instance) Form(params *InstanceParams) error {
if params.ID > 0 {
mTechnologyInstance.ID = params.ID
isExist, err := model2.FirstField(mTechnologyInstance.TechnologyInstance, []string{"id", "m_uid",
"status", "created_at", "updated_at"})
isExist, err := model2.FirstField(mTechnologyInstance.TechnologyInstance, []string{"id", "uid", "status", "created_at"})
if err != nil {
return err
} else if !isExist {
return errors.New("信息不存在")
} else if c.ManageUID != mTechnologyInstance.MUid {
return errors.New("操作错误，技术信息不存在或已被删除")
} else if c.UID != mTechnologyInstance.UID {
return errors.New("操作错误，无权限操作")
} else if mTechnologyInstance.Status != model2.TechnologyInstanceStatusForDraft &&
mTechnologyInstance.Status != model2.TechnologyInstanceStatusForRefuse {
@ -106,9 +107,8 @@ func (c *Instance) Form(params *InstanceParams) error {
mTechnologyInstance.Status = model2.TechnologyInstanceStatusForExamining
return model2.Updates(mTechnologyInstance.TechnologyInstance, mTechnologyInstance.TechnologyInstance)
}
mTechnologyInstance.MUid = c.ManageUID
mTechnologyInstance.UID = c.UID
mTechnologyInstance.Local.Local = c.local
mTechnologyInstance.TenantID = c.TenantID
if params.IsSubmit > 0 {
mTechnologyInstance.Status = model2.TechnologyInstanceStatusForExamining
@ -120,13 +120,13 @@ func (c *Instance) Form(params *InstanceParams) error {
func (c *Instance) Shelf(id uint64, status int) error {
mTechnologyInstance := model.NewTechnologyInstance()
mTechnologyInstance.ID = id
isExist, err := model2.FirstField(mTechnologyInstance.TechnologyInstance, []string{"id", "m_uid", "shelf", "status"})
isExist, err := model2.FirstField(mTechnologyInstance.TechnologyInstance, []string{"id", "uid", "shelf", "status"})
if err != nil {
return err
} else if !isExist {
return errors.New("信息不存在")
} else if c.ManageUID != mTechnologyInstance.MUid {
} else if c.UID != mTechnologyInstance.UID {
return errors.New("操作错误，无权限操作")
} else if mTechnologyInstance.Status != model2.TechnologyInstanceStatusForAgree {
return errors.New("操作错误，当前状态不允许处理上下架")
@ -145,13 +145,13 @@ func (c *Instance) Shelf(id uint64, status int) error {
func (c *Instance) Delete(id uint64) error {
mTechnologyInstance := model.NewTechnologyInstance()
mTechnologyInstance.ID = id
isExist, err := model2.FirstField(mTechnologyInstance.TechnologyInstance, []string{"id", "m_uid"})
isExist, err := model2.FirstField(mTechnologyInstance.TechnologyInstance, []string{"id", "uid"})
if err != nil {
return err
} else if !isExist {
return errors.New("信息不存在")
} else if c.ManageUID != mTechnologyInstance.MUid {
} else if c.UID != mTechnologyInstance.UID {
return errors.New("操作错误，无权限操作")
}
if err = model2.Delete(mTechnologyInstance.TechnologyInstance); err != nil {