|
|
|
@ -203,7 +203,7 @@ func (oa *ApprovalOA) SaveApprovalContent(in *approval.CreateRequest, a *Approva
|
|
|
|
|
fmt.Println("approval info :", a.CopyUsers)
|
|
|
|
|
fmt.Println("approval info :", a.ApprovalUsers)
|
|
|
|
|
|
|
|
|
|
approvalOA, err := oa.copyOAToModel(in, a)
|
|
|
|
|
approvalOA, err := copyOAToModel(in, a)
|
|
|
|
|
if err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
@ -213,7 +213,7 @@ func (oa *ApprovalOA) SaveApprovalContent(in *approval.CreateRequest, a *Approva
|
|
|
|
|
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)
|
|
|
|
|
copier.CopyWithOption(&approvalOA, in.ApprovalOA, copier.Option{DeepCopy: true})
|
|
|
|
|
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("============== 打印 审批内容 ========== 结束 =========")
|
|
|
|
|
|
|
|
|
|
if err := oa.addOtherInfoToModel(in, a, approvalOA); err != nil {
|
|
|
|
|
if err := addOtherInfoToModel(in, a, approvalOA); err != nil {
|
|
|
|
|
return nil, err
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -239,7 +239,7 @@ func (oa *ApprovalOA) copyOAToModel(in *approval.CreateRequest, a *Approval) (ap
|
|
|
|
|
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 {
|
|
|
|
|
switch v {
|
|
|
|
|
case "leave":
|
|
|
|
@ -366,7 +366,7 @@ func (oa *ApprovalOA) UpdateApprovalContent(in *approval.CreateRequest, a *Appro
|
|
|
|
|
|
|
|
|
|
oa.ID = entity.ID
|
|
|
|
|
|
|
|
|
|
approvalOA, err := oa.copyOAToModel(in, a)
|
|
|
|
|
approvalOA, err := copyOAToModel(in, a)
|
|
|
|
|
if err != nil {
|
|
|
|
|
return err
|
|
|
|
|
}
|
|
|
|
|