luyanming/fonchain-approval-fork
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'oa' into dev

Browse Source
This commit is contained in:
jhc 2023-05-12 16:17:26 +08:00
commit 83845f8037
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/model/approval_oa.go
View File

@ -203,7 +203,7 @@ func (oa *ApprovalOA) SaveApprovalContent(in *approval.CreateRequest, a *Approva
fmt.Println("approval info :", a.CopyUsers) fmt.Println("approval info :", a.CopyUsers)
fmt.Println("approval info :", a.ApprovalUsers) fmt.Println("approval info :", a.ApprovalUsers)
approvalOA, err := oa.copyOAToModel(in, a) approvalOA, err := copyOAToModel(in, a)
if err != nil { if err != nil {
return err return err
} }
@ -213,7 +213,7 @@ func (oa *ApprovalOA) SaveApprovalContent(in *approval.CreateRequest, a *Approva
return DB.Create(approvalOA).Error return DB.Create(approvalOA).Error
} }
func (oa *ApprovalOA) copyOAToModel(in *approval.CreateRequest, a *Approval) (approvalOA *ApprovalOA, err error) { func copyOAToModel(in *approval.CreateRequest, a *Approval) (approvalOA *ApprovalOA, err error) {
approvalOA = new(ApprovalOA) approvalOA = new(ApprovalOA)
copier.CopyWithOption(&approvalOA, in.ApprovalOA, copier.Option{DeepCopy: true}) copier.CopyWithOption(&approvalOA, in.ApprovalOA, copier.Option{DeepCopy: true})
approvalOA.ApprovalID = a.ID approvalOA.ApprovalID = a.ID
@ -225,7 +225,7 @@ func (oa *ApprovalOA) copyOAToModel(in *approval.CreateRequest, a *Approval) (ap
fmt.Println("a ApprovalUsers info is : ", a.ApprovalUsers) fmt.Println("a ApprovalUsers info is : ", a.ApprovalUsers)
fmt.Println("============== 打印 审批内容 ========== 结束 =========") fmt.Println("============== 打印 审批内容 ========== 结束 =========")
if err := oa.addOtherInfoToModel(in, a, approvalOA); err != nil { if err := addOtherInfoToModel(in, a, approvalOA); err != nil {
return nil, err return nil, err
} }
@ -239,7 +239,7 @@ func (oa *ApprovalOA) copyOAToModel(in *approval.CreateRequest, a *Approval) (ap
return approvalOA, nil return approvalOA, nil
} }
func (oa *ApprovalOA) addOtherInfoToModel(in *approval.CreateRequest, a *Approval, approvalOA *ApprovalOA) error { func addOtherInfoToModel(in *approval.CreateRequest, a *Approval, approvalOA *ApprovalOA) error {
if v, ok := sonMap[a.ApprovalType.KeyWord]; ok { if v, ok := sonMap[a.ApprovalType.KeyWord]; ok {
switch v { switch v {
case "leave": case "leave":
@ -366,7 +366,7 @@ func (oa *ApprovalOA) UpdateApprovalContent(in *approval.CreateRequest, a *Appro
oa.ID = entity.ID oa.ID = entity.ID
approvalOA, err := oa.copyOAToModel(in, a) approvalOA, err := copyOAToModel(in, a)
if err != nil { if err != nil {
return err return err
} }