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
2022-01-11 17:24:38 +08:00
parent 72c2cb091d
commit 58dc5fd6c9
13 changed files with 475 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/api/admin/controller/service/innovate.go
View File

@ -143,7 +143,6 @@ func (c *Innovate) Form(params *InnovateParams) error {
// Delete 删除操作
func (c *Innovate) Delete(id uint64) error {
mServiceInnovate := model.NewServiceInnovate()
mServiceInnovate.ID = id
isExist, err := model2.FirstField(mServiceInnovate.ServiceInnovate, []string{"id", "tenant_id"})
@ -199,11 +198,15 @@ func (c *Innovate) KindSelect() ([]*InnovateKindSelectInfo, error) {
out := make([]*model2.ServiceInnovateKind, 0)
where := []*model2.ModelWhereOrder{&model2.ModelWhereOrder{
Where: model2.NewWhere("tenant_id", c.TenantID),
Order: model2.NewOrder("sort", model2.OrderModeToAsc),
}, &model2.ModelWhereOrder{
Order: model2.NewOrder("id", model2.OrderModeToDesc),
}}
if c.TenantID > 0 {
where = append(where, &model2.ModelWhereOrder{
Where: model2.NewWhere("tenant_id", c.TenantID),
})
}
if err := model2.ScanFields(mServiceInnovateKind.ServiceInnovateKind, &out, []string{"id", "title"}, where...); err != nil {
return nil, err
}

22
app/api/admin/controller/service/message.go
View File

@ -91,13 +91,33 @@ func (c *Message) Handle(id uint64, content string) error {
mServiceMessageLog.MessageID = id
mServiceMessageLog.Content = content
if err = model2.Create(mServiceMessage.ServiceMessage); err != nil {
if err = model2.Create(mServiceMessage.ServiceMessage, tx); err != nil {
return err
}
return nil
})
}
// Delete 删除操作
func (c *Message) Delete(id uint64) error {
mServiceMessage := model.NewServiceMessage()
mServiceMessage.ID = id
isExist, err := model2.FirstField(mServiceMessage.ServiceMessage, []string{"id", "tenant_id", "status"})
if err != nil {
return err
} else if !isExist {
return errors.New("操作错误，留言信息不存在或已被删除")
} else if c.TenantID > 0 && mServiceMessage.TenantID != c.TenantID {
return errors.New("操作错误，无权限操作")
}
if mServiceMessage.Status != model2.ServiceMessageStatusForProcessing {
return errors.New("操作错误，当前留言信息已处理")
}
return model2.Delete(mServiceMessage.ServiceMessage)
}
func NewMessage() MessageHandle {
return func(session *session.Admin) *Message {
return &Message{session}

7
app/api/admin/controller/service/solution_case.go
View File

@ -220,11 +220,16 @@ func (c *SolutionCase) KindSelect() (map[model2.ServiceSolutionCaseMode]*Solutio
mServiceSolutionCaseKind := model.NewServiceSolutionCaseKind()
where := []*model2.ModelWhereOrder{&model2.ModelWhereOrder{
Where: model2.NewWhere("tenant_id", c.TenantID),
Order: model2.NewOrder("sort", model2.OrderModeToAsc),
}, &model2.ModelWhereOrder{
Order: model2.NewOrder("id", model2.OrderModeToDesc),
}}
if c.TenantID > 0 {
where = append(where, &model2.ModelWhereOrder{
Where: model2.NewWhere("tenant_id", c.TenantID),
})
}
out := make([]*model2.ServiceSolutionCaseKind, 0)
if err := model2.ScanFields(mServiceSolutionCaseKind.ServiceSolutionCaseKind, &out, []string{"id", "mode", "title"}, where...); err != nil {