diff --git a/pkg/model/approval_oa.go b/pkg/model/approval_oa.go index f4ee7b6..c7b903c 100644 --- a/pkg/model/approval_oa.go +++ b/pkg/model/approval_oa.go @@ -219,19 +219,19 @@ func copyOAToModel(in *approval.CreateRequest, a *Approval) (approvalOA *Approva approvalOA.ApprovalID = a.ID fmt.Println("============== 打印 审批内容 1.0 ========== 开始 =========") - fmt.Println("approval_oa info is : ", approvalOA) - fmt.Println("approval_oa info is : ", approvalOA.Leave) + fmt.Printf("approval_oa info is : %+v\n", approvalOA) + fmt.Printf("approval_oa info is : %+v\n", approvalOA.Leave) fmt.Println("a CopyUsers info is : ", a.CopyUsers) fmt.Println("a ApprovalUsers info is : ", a.ApprovalUsers) fmt.Println("============== 打印 审批内容 ========== 结束 =========") - if err := addOtherInfoToModel(in, a, approvalOA); err != nil { + if err := addOtherInfoToModel(a, approvalOA); err != nil { return nil, err } fmt.Println("============== 打印 审批内容 2.0 ========== 开始 =========") - fmt.Println("approval_oa info is : ", approvalOA) - fmt.Println("approval_oa info is : ", approvalOA.Leave) + fmt.Printf("approval_oa info is : %+v\n", approvalOA) + fmt.Printf("approval_oa info is : %+v\n", approvalOA.Leave) fmt.Println("a CopyUsers info is : ", a.CopyUsers) fmt.Println("a ApprovalUsers info is : ", a.ApprovalUsers) fmt.Println("============== 打印 审批内容 ========== 结束 =========") @@ -239,26 +239,22 @@ func copyOAToModel(in *approval.CreateRequest, a *Approval) (approvalOA *Approva return approvalOA, nil } -func addOtherInfoToModel(in *approval.CreateRequest, a *Approval, approvalOA *ApprovalOA) error { +func addOtherInfoToModel(a *Approval, approvalOA *ApprovalOA) error { if v, ok := sonMap[a.ApprovalType.KeyWord]; ok { switch v { case "leave": - approvalOA.Leave.ApprovalUsers = make([]ApprovalUser, 0) - approvalOA.Leave.ApprovalUsers = a.ApprovalUsers + copier.CopyWithOption(&approvalOA.Leave.ApprovalUsers, a.ApprovalUsers, copier.Option{DeepCopy: true}) fmt.Println("============== 打印 审批内容 3.0 ========== 开始 =========") - fmt.Println("approval_oa info is : ", approvalOA) - fmt.Println("approval_oa info is : ", approvalOA.Leave) - //fmt.Println("a CopyUsers info is : ", a.CopyUsers) + fmt.Printf("approval_oa info is : %+v\n", approvalOA) + fmt.Printf("approval_oa info is : %+v\n", approvalOA.Leave) fmt.Println("a ApprovalUsers info is : ", a.ApprovalUsers) fmt.Println("============== 打印 审批内容 ========== 结束 =========") - approvalOA.Leave.CopyUsers = make([]CopyUser, 0) - approvalOA.Leave.CopyUsers = a.CopyUsers + copier.CopyWithOption(&approvalOA.Leave.CopyUsers, a.CopyUsers, copier.Option{DeepCopy: true}) fmt.Println("============== 打印 审批内容 4.0 ========== 开始 =========") - fmt.Println("approval_oa info is : ", approvalOA) - fmt.Println("approval_oa info is : ", approvalOA.Leave) + fmt.Printf("approval_oa info is : %+v\n", approvalOA) + fmt.Printf("approval_oa info is : %+v\n", approvalOA.Leave) fmt.Println("a CopyUsers info is : ", a.CopyUsers) - //fmt.Println("a ApprovalUsers info is : ", a.ApprovalUsers) fmt.Println("============== 打印 审批内容 ========== 结束 =========") if approvalOA.Leave.ApplyType == "" { @@ -267,15 +263,6 @@ func addOtherInfoToModel(in *approval.CreateRequest, a *Approval, approvalOA *Ap approvalOA.Leave.ApprovalID = strconv.FormatUint(a.ID, 10) approvalOA.Leave.Status = int32(a.Status) - //applyTimes := make([]ApplyTime, 0) - //for i := 0; i < len(in.ApprovalOA.Leave.ApplyTimes); i++ { - // applyTimes = append(applyTimes, ApplyTime{ - // Date: in.ApprovalOA.Leave.ApplyTimes[i].Date, - // Hour: in.ApprovalOA.Leave.ApplyTimes[i].Hour, - // M: in.ApprovalOA.Leave.ApplyTimes[i].M, - // }) - //} - //approvalOA.Leave.ApplyTimes = applyTimes case "makeUp": approvalOA.MakeUp.ApprovalUsers = a.ApprovalUsers approvalOA.MakeUp.CopyUsers = a.CopyUsers @@ -283,15 +270,6 @@ func addOtherInfoToModel(in *approval.CreateRequest, a *Approval, approvalOA *Ap approvalOA.MakeUp.ApprovalID = strconv.FormatUint(a.ID, 10) approvalOA.MakeUp.Status = int32(a.Status) - //applyTimes := make([]ApplyTime, 0) - //for i := 0; i < len(in.ApprovalOA.MakeUp.ApplyTimes); i++ { - // applyTimes = append(applyTimes, ApplyTime{ - // Date: in.ApprovalOA.MakeUp.ApplyTimes[i].Date, - // Hour: in.ApprovalOA.MakeUp.ApplyTimes[i].Hour, - // M: in.ApprovalOA.MakeUp.ApplyTimes[i].M, - // }) - //} - //approvalOA.MakeUp.ApplyTimes = applyTimes case "overTime": approvalOA.OverTime.ApprovalUsers = a.ApprovalUsers approvalOA.OverTime.CopyUsers = a.CopyUsers @@ -299,15 +277,6 @@ func addOtherInfoToModel(in *approval.CreateRequest, a *Approval, approvalOA *Ap approvalOA.OverTime.ApprovalID = strconv.FormatUint(a.ID, 10) approvalOA.OverTime.Status = int32(a.Status) - //applyTimes := make([]ApplyTime, 0) - //for i := 0; i < len(in.ApprovalOA.OverTime.ApplyTimes); i++ { - // applyTimes = append(applyTimes, ApplyTime{ - // Date: in.ApprovalOA.OverTime.ApplyTimes[i].Date, - // Hour: in.ApprovalOA.OverTime.ApplyTimes[i].Hour, - // M: in.ApprovalOA.OverTime.ApplyTimes[i].M, - // }) - //} - //approvalOA.OverTime.ApplyTimes = applyTimes case "outWork": approvalOA.OutWork.ApprovalUsers = a.ApprovalUsers approvalOA.OutWork.CopyUsers = a.CopyUsers @@ -315,15 +284,6 @@ func addOtherInfoToModel(in *approval.CreateRequest, a *Approval, approvalOA *Ap approvalOA.OutWork.ApprovalID = strconv.FormatUint(a.ID, 10) approvalOA.OutWork.Status = int32(a.Status) - //applyTimes := make([]ApplyTime, 0) - //for i := 0; i < len(in.ApprovalOA.OutWork.ApplyTimes); i++ { - // applyTimes = append(applyTimes, ApplyTime{ - // Date: in.ApprovalOA.OutWork.ApplyTimes[i].Date, - // Hour: in.ApprovalOA.OutWork.ApplyTimes[i].Hour, - // M: in.ApprovalOA.OutWork.ApplyTimes[i].M, - // }) - //} - //approvalOA.OutWork.ApplyTimes = applyTimes case "turnover": approvalOA.Turnover.ApprovalUsers = a.ApprovalUsers approvalOA.Turnover.CopyUsers = a.CopyUsers @@ -331,15 +291,6 @@ func addOtherInfoToModel(in *approval.CreateRequest, a *Approval, approvalOA *Ap approvalOA.Turnover.ApprovalID = strconv.FormatUint(a.ID, 10) approvalOA.Turnover.Status = int32(a.Status) - //applyTimes := make([]ApplyTime, 0) - //for i := 0; i < len(in.ApprovalOA.Turnover.ApplyTimes); i++ { - // applyTimes = append(applyTimes, ApplyTime{ - // Date: in.ApprovalOA.Turnover.ApplyTimes[i].Date, - // Hour: in.ApprovalOA.Turnover.ApplyTimes[i].Hour, - // M: in.ApprovalOA.Turnover.ApplyTimes[i].M, - // }) - //} - //approvalOA.Turnover.ApplyTimes = applyTimes case "leaveApply": approvalOA.LeaveApply.ApprovalUsers = a.ApprovalUsers approvalOA.LeaveApply.CopyUsers = a.CopyUsers