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-18 17:31:20 +08:00
parent 10224e8db6
commit 26a3205c08
8 changed files with 75 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/api/admin/api/manage.go
View File

@ -20,8 +20,8 @@ type (
)
// handle 审核处理
func (a *manageExamineForm) handle(session *session.Admin) error {
return manage.NewExamine()(session).Launch(a.Convert(), a.Identity, a.Status)
func (a *manageExamineForm) handle(session *session.Admin, params map[string]interface{}) error {
return manage.NewExamine()(session).Launch(a.Convert(), a.Identity, a.Status, params)
}
func (*Manage) Company(c *gin.Context) {
@ -29,14 +29,18 @@ func (*Manage) Company(c *gin.Context) {
}
func (*Manage) CompanyExamine(c *gin.Context) {
form := new(manageExamineForm)
form := &struct {
manageExamineForm
Kind int `json:"kind" form:"kind" binding:"required"`
}{}
if err := api.Bind(form)(c); err != nil {
api.APIFailure(err.(error))(c)
return
}
form.Identity = config.TenantUserIdentityForCompany
err := form.handle(api.GetSession()(c).(*session.Admin))
err := form.handle(api.GetSession()(c).(*session.Admin), map[string]interface{}{
"kind": form.Kind,
})
api.APIResponse(err)
}
@ -63,7 +67,7 @@ func (*Manage) ExpertExamine(c *gin.Context) {
return
}
form.Identity = config.TenantUserIdentityForExpert
err := form.handle(api.GetSession()(c).(*session.Admin))
err := form.handle(api.GetSession()(c).(*session.Admin), nil)
api.APIResponse(err)
}
@ -79,7 +83,7 @@ func (*Manage) LaboratoryExamine(c *gin.Context) {
return
}
form.Identity = config.TenantUserIdentityForLaboratory
err := form.handle(api.GetSession()(c).(*session.Admin))
err := form.handle(api.GetSession()(c).(*session.Admin), nil)
api.APIResponse(err)
}
@ -95,7 +99,7 @@ func (*Manage) ResearchExamine(c *gin.Context) {
return
}
form.Identity = config.TenantUserIdentityForResearch
err := form.handle(api.GetSession()(c).(*session.Admin))
err := form.handle(api.GetSession()(c).(*session.Admin), nil)
api.APIResponse(err)
}
@ -111,6 +115,6 @@ func (*Manage) AgentExamine(c *gin.Context) {
return
}
form.Identity = config.TenantUserIdentityForAgent
err := form.handle(api.GetSession()(c).(*session.Admin))
err := form.handle(api.GetSession()(c).(*session.Admin), nil)
api.APIResponse(err)
}

11
app/api/admin/controller/manage/examine.go
View File

@ -167,7 +167,7 @@ func examineAgent(id, tenantID uint64) (*ExamineManageInfo, error) {
}
// Launch 发起审核
func (c *Examine) Launch(id uint64, identity, status int) error {
func (c *Examine) Launch(id uint64, identity, status int, params map[string]interface{}) error {
_status := model2.ExamineStatusKind(status)
if _status != model2.ExamineStatusForRefuse && _status != model2.ExamineStatusForAgree {
@ -184,7 +184,14 @@ func (c *Examine) Launch(id uint64, identity, status int) error {
return err
}
return orm.GetDB().Transaction(func(tx *gorm.DB) error {
if err = model2.Updates(data.IModel, map[string]interface{}{"examine_status": status, "updated_at": time.Now()}, tx); err != nil {
values := map[string]interface{}{"examine_status": status, "updated_at": time.Now()}
if identity == config.TenantUserIdentityForCompany {
for k, v := range params {
values[k] = v
}
}
if err = model2.Updates(data.IModel, values, tx); err != nil {
return err
}
// 拒绝后，不执行以下数据