feat:完善入驻信息管理

This commit is contained in:
henry
2021-12-03 10:08:23 +08:00
parent 199e6f0669
commit d9cbdd2486
26 changed files with 208 additions and 126 deletions

View File

@ -19,9 +19,8 @@ type Examine struct {
type ExamineHandle func(session *service.Session, local string) *Examine
type ExamineManageInfo struct {
IModel model2.IModel
TenantID uint64 // 租户ID
UID uint64 // 用户表UUID
IModel model2.IModel
UIDs []uint64 // 用户表UUID
}
// examineHandle 审核处理
@ -50,11 +49,11 @@ func examineCompany(id uint64) (*ExamineManageInfo, error) {
if err != nil {
return nil, err
} else if mManageCompany.Status != model2.ExamineStatusForOngoing {
} else if mManageCompany.Examine.ExamineStatus != model2.ExamineStatusForOngoing {
return nil, errors.New("当前入住信息已审核")
}
return &ExamineManageInfo{
IModel: mManageCompany.ManageCompany, UID: mManageCompany.UID,
IModel: mManageCompany.ManageCompany,
}, nil
}
@ -65,11 +64,11 @@ func examineExpert(id uint64) (*ExamineManageInfo, error) {
if err != nil {
return nil, err
} else if mManageExpert.Status != model2.ExamineStatusForOngoing {
} else if mManageExpert.Examine.ExamineStatus != model2.ExamineStatusForOngoing {
return nil, errors.New("当前入住信息已审核")
}
return &ExamineManageInfo{
IModel: mManageExpert.ManageExpert, UID: mManageExpert.UID,
IModel: mManageExpert.ManageExpert,
}, nil
}
@ -80,11 +79,11 @@ func examineResearch(id uint64) (*ExamineManageInfo, error) {
if err != nil {
return nil, err
} else if mManageResearch.Status != model2.ExamineStatusForOngoing {
} else if mManageResearch.Examine.ExamineStatus != model2.ExamineStatusForOngoing {
return nil, errors.New("当前入住信息已审核")
}
return &ExamineManageInfo{
IModel: mManageResearch.ManageResearch, UID: mManageResearch.UID,
IModel: mManageResearch.ManageResearch,
}, nil
}
@ -95,11 +94,11 @@ func examineLaboratory(id uint64) (*ExamineManageInfo, error) {
if err != nil {
return nil, err
} else if mManageLaboratory.Status != model2.ExamineStatusForOngoing {
} else if mManageLaboratory.Examine.ExamineStatus != model2.ExamineStatusForOngoing {
return nil, errors.New("当前入住信息已审核")
}
return &ExamineManageInfo{
IModel: mManageLaboratory.ManageLaboratory, UID: mManageLaboratory.UID,
IModel: mManageLaboratory.ManageLaboratory,
}, nil
}
@ -134,19 +133,20 @@ func (c *Examine) Launch(id uint64, identity, status int) error {
isExist := true
if isExist, err = model2.FirstField(mUserIdentity.UserIdentity, []string{"id", "uid"}, model2.NewWhere("uid", data.UID),
if isExist, err = model2.FirstField(mUserIdentity.UserIdentity, []string{"id", "uid"},
model2.NewWhere("uid", 0),
model2.NewWhere("identity", identity)); err != nil {
return err
}
if !isExist {
mUserIdentity.UID = data.UID
//mUserIdentity.UID = data.UID
mUserIdentity.Identity = identity
}
// 更新账户身份信息
mUserInstance := model.NewUserInstance()
if _, err = model2.FirstField(mUserInstance.UserInstance, []string{"id", "uuid", "identity"},
model2.NewWhere("uuid", data.UID)); err != nil {
model2.NewWhere("uuid", 0)); err != nil {
return err
}
if err = model2.Updates(mUserInstance.UserInstance, map[string]interface{}{