diff --git a/pkg/model/approval_oa.go b/pkg/model/approval_oa.go index 5ab1597..edb8330 100644 --- a/pkg/model/approval_oa.go +++ b/pkg/model/approval_oa.go @@ -301,41 +301,16 @@ func copyOAToModel(in *approval.CreateRequest, a *Approval) (approvalOA *Approva return nil, err } - fmt.Println("============== 打印 审批内容 2.0 ========== 开始 =========") - 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("============== 打印 审批内容 ========== 结束 =========") - return approvalOA, nil } func addOtherInfoToModel(a *Approval, approvalOA *ApprovalOA) error { - fmt.Println("============== 打印 审批内容 5.0 ========== 开始 =========") - fmt.Printf("approval_oa info is : %+v\n", approvalOA) - fmt.Printf("approval_oa info is : %+v\n", approvalOA.Leave) - fmt.Printf("a info is : %+v\n", a) - fmt.Println("============== 打印 审批内容 ========== 结束 =========") - - fmt.Println(sonMap[a.Type]) v := GetSonMapValue(a.Type) switch v { case "leave": copier.CopyWithOption(&approvalOA.Leave.ApprovalUsers, a.ApprovalUsers, copier.Option{DeepCopy: true}) - fmt.Println("============== 打印 审批内容 3.0 ========== 开始 =========") - 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("============== 打印 审批内容 ========== 结束 =========") - copier.CopyWithOption(&approvalOA.Leave.CopyUsers, a.CopyUsers, copier.Option{DeepCopy: true}) - fmt.Println("============== 打印 审批内容 4.0 ========== 开始 =========") - 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("============== 打印 审批内容 ========== 结束 =========") if approvalOA.Leave.ApplyType == "" { approvalOA.Leave.ApplyType = a.Type @@ -344,36 +319,41 @@ func addOtherInfoToModel(a *Approval, approvalOA *ApprovalOA) error { approvalOA.Leave.Status = int32(a.Status) case "makeUp": - approvalOA.MakeUp.ApprovalUsers = a.ApprovalUsers - approvalOA.MakeUp.CopyUsers = a.CopyUsers + copier.CopyWithOption(&approvalOA.MakeUp.ApprovalUsers, a.ApprovalUsers, copier.Option{DeepCopy: true}) + copier.CopyWithOption(&approvalOA.MakeUp.CopyUsers, a.CopyUsers, copier.Option{DeepCopy: true}) + approvalOA.MakeUp.ApplyType = a.Type approvalOA.MakeUp.ApprovalID = strconv.FormatUint(a.ID, 10) approvalOA.MakeUp.Status = int32(a.Status) case "overTime": - approvalOA.OverTime.ApprovalUsers = a.ApprovalUsers - approvalOA.OverTime.CopyUsers = a.CopyUsers + copier.CopyWithOption(&approvalOA.OverTime.ApprovalUsers, a.ApprovalUsers, copier.Option{DeepCopy: true}) + copier.CopyWithOption(&approvalOA.OverTime.CopyUsers, a.CopyUsers, copier.Option{DeepCopy: true}) + approvalOA.OverTime.ApplyType = a.Type approvalOA.OverTime.ApprovalID = strconv.FormatUint(a.ID, 10) approvalOA.OverTime.Status = int32(a.Status) case "outWork": - approvalOA.OutWork.ApprovalUsers = a.ApprovalUsers - approvalOA.OutWork.CopyUsers = a.CopyUsers + copier.CopyWithOption(&approvalOA.OutWork.ApprovalUsers, a.ApprovalUsers, copier.Option{DeepCopy: true}) + copier.CopyWithOption(&approvalOA.OutWork.CopyUsers, a.CopyUsers, copier.Option{DeepCopy: true}) + approvalOA.OutWork.ApplyType = a.Type approvalOA.OutWork.ApprovalID = strconv.FormatUint(a.ID, 10) approvalOA.OutWork.Status = int32(a.Status) case "turnover": - approvalOA.Turnover.ApprovalUsers = a.ApprovalUsers - approvalOA.Turnover.CopyUsers = a.CopyUsers + copier.CopyWithOption(&approvalOA.Turnover.ApprovalUsers, a.ApprovalUsers, copier.Option{DeepCopy: true}) + copier.CopyWithOption(&approvalOA.Turnover.CopyUsers, a.CopyUsers, copier.Option{DeepCopy: true}) + approvalOA.Turnover.ApplyType = a.Type approvalOA.Turnover.ApprovalID = strconv.FormatUint(a.ID, 10) approvalOA.Turnover.Status = int32(a.Status) case "leaveApply": - approvalOA.LeaveApply.ApprovalUsers = a.ApprovalUsers - approvalOA.LeaveApply.CopyUsers = a.CopyUsers + copier.CopyWithOption(&approvalOA.LeaveApply.ApprovalUsers, a.ApprovalUsers, copier.Option{DeepCopy: true}) + copier.CopyWithOption(&approvalOA.LeaveApply.CopyUsers, a.CopyUsers, copier.Option{DeepCopy: true}) + approvalOA.LeaveApply.ApplyType = a.Type approvalOA.LeaveApply.ApprovalID = strconv.FormatUint(a.ID, 10) approvalOA.LeaveApply.Status = int32(a.Status) @@ -412,9 +392,10 @@ func (oa *ApprovalOA) BuildResContent(a *Approval, request *approval.CreateReque func (oa *ApprovalOA) copyOAToRpc(a *Approval, in *approval.CreateRequest) error { copier.CopyWithOption(&in.ApprovalOA, a, copier.Option{DeepCopy: true}) - //if err := oa.addOtherInfoToRpc(a, in); err != nil { - // return err - //} + fmt.Println("============== 查询 审批内容 1.0 ========== 开始 =========") + fmt.Printf("approval_oa info is : %+v\n", a) + fmt.Printf("in.ApprovalOA info is : %+v\n", in.ApprovalOA) + fmt.Println("============== 查询 审批内容 ========== 结束 =========") return nil }