|
|
@ -219,19 +219,19 @@ func copyOAToModel(in *approval.CreateRequest, a *Approval) (approvalOA *Approva
|
|
|
|
approvalOA.ApprovalID = a.ID
|
|
|
|
approvalOA.ApprovalID = a.ID
|
|
|
|
|
|
|
|
|
|
|
|
fmt.Println("============== 打印 审批内容 1.0 ========== 开始 =========")
|
|
|
|
fmt.Println("============== 打印 审批内容 1.0 ========== 开始 =========")
|
|
|
|
fmt.Println("approval_oa info is : ", approvalOA)
|
|
|
|
fmt.Printf("approval_oa info is : %+v\n", approvalOA)
|
|
|
|
fmt.Println("approval_oa info is : ", approvalOA.Leave)
|
|
|
|
fmt.Printf("approval_oa info is : %+v\n", approvalOA.Leave)
|
|
|
|
fmt.Println("a CopyUsers info is : ", a.CopyUsers)
|
|
|
|
fmt.Println("a CopyUsers info is : ", a.CopyUsers)
|
|
|
|
fmt.Println("a ApprovalUsers info is : ", a.ApprovalUsers)
|
|
|
|
fmt.Println("a ApprovalUsers info is : ", a.ApprovalUsers)
|
|
|
|
fmt.Println("============== 打印 审批内容 ========== 结束 =========")
|
|
|
|
fmt.Println("============== 打印 审批内容 ========== 结束 =========")
|
|
|
|
|
|
|
|
|
|
|
|
if err := addOtherInfoToModel(in, a, approvalOA); err != nil {
|
|
|
|
if err := addOtherInfoToModel(a, approvalOA); err != nil {
|
|
|
|
return nil, err
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
fmt.Println("============== 打印 审批内容 2.0 ========== 开始 =========")
|
|
|
|
fmt.Println("============== 打印 审批内容 2.0 ========== 开始 =========")
|
|
|
|
fmt.Println("approval_oa info is : ", approvalOA)
|
|
|
|
fmt.Printf("approval_oa info is : %+v\n", approvalOA)
|
|
|
|
fmt.Println("approval_oa info is : ", approvalOA.Leave)
|
|
|
|
fmt.Printf("approval_oa info is : %+v\n", approvalOA.Leave)
|
|
|
|
fmt.Println("a CopyUsers info is : ", a.CopyUsers)
|
|
|
|
fmt.Println("a CopyUsers info is : ", a.CopyUsers)
|
|
|
|
fmt.Println("a ApprovalUsers info is : ", a.ApprovalUsers)
|
|
|
|
fmt.Println("a ApprovalUsers info is : ", a.ApprovalUsers)
|
|
|
|
fmt.Println("============== 打印 审批内容 ========== 结束 =========")
|
|
|
|
fmt.Println("============== 打印 审批内容 ========== 结束 =========")
|
|
|
@ -245,15 +245,15 @@ func addOtherInfoToModel(a *Approval, approvalOA *ApprovalOA) error {
|
|
|
|
case "leave":
|
|
|
|
case "leave":
|
|
|
|
copier.CopyWithOption(&approvalOA.Leave.ApprovalUsers, a.ApprovalUsers, copier.Option{DeepCopy: true})
|
|
|
|
copier.CopyWithOption(&approvalOA.Leave.ApprovalUsers, a.ApprovalUsers, copier.Option{DeepCopy: true})
|
|
|
|
fmt.Println("============== 打印 审批内容 3.0 ========== 开始 =========")
|
|
|
|
fmt.Println("============== 打印 审批内容 3.0 ========== 开始 =========")
|
|
|
|
fmt.Println("approval_oa info is : ", approvalOA)
|
|
|
|
fmt.Printf("approval_oa info is : %+v\n", approvalOA)
|
|
|
|
fmt.Println("approval_oa info is : ", approvalOA.Leave)
|
|
|
|
fmt.Printf("approval_oa info is : %+v\n", approvalOA.Leave)
|
|
|
|
fmt.Println("a ApprovalUsers info is : ", a.ApprovalUsers)
|
|
|
|
fmt.Println("a ApprovalUsers info is : ", a.ApprovalUsers)
|
|
|
|
fmt.Println("============== 打印 审批内容 ========== 结束 =========")
|
|
|
|
fmt.Println("============== 打印 审批内容 ========== 结束 =========")
|
|
|
|
|
|
|
|
|
|
|
|
copier.CopyWithOption(&approvalOA.Leave.CopyUsers, a.CopyUsers, copier.Option{DeepCopy: true})
|
|
|
|
copier.CopyWithOption(&approvalOA.Leave.CopyUsers, a.CopyUsers, copier.Option{DeepCopy: true})
|
|
|
|
fmt.Println("============== 打印 审批内容 4.0 ========== 开始 =========")
|
|
|
|
fmt.Println("============== 打印 审批内容 4.0 ========== 开始 =========")
|
|
|
|
fmt.Println("approval_oa info is : ", approvalOA)
|
|
|
|
fmt.Printf("approval_oa info is : %+v\n", approvalOA)
|
|
|
|
fmt.Println("approval_oa info is : ", approvalOA.Leave)
|
|
|
|
fmt.Printf("approval_oa info is : %+v\n", approvalOA.Leave)
|
|
|
|
fmt.Println("a CopyUsers info is : ", a.CopyUsers)
|
|
|
|
fmt.Println("a CopyUsers info is : ", a.CopyUsers)
|
|
|
|
fmt.Println("============== 打印 审批内容 ========== 结束 =========")
|
|
|
|
fmt.Println("============== 打印 审批内容 ========== 结束 =========")
|
|
|
|
|
|
|
|
|
|
|
|