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 14:47:30 +08:00
commit e5463203ee
1 changed files with 42 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
pkg/model/approval_oa.go
View File

@ -199,14 +199,12 @@ func (oa *ApprovalOA) GetApproval(id uint64) (*Approval, error) {
func (oa *ApprovalOA) SaveApprovalContent(in *approval.CreateRequest, a *Approval) error { func (oa *ApprovalOA) SaveApprovalContent(in *approval.CreateRequest, a *Approval) error {
fmt.Println("保存 approval_oa 信息 ") fmt.Println("保存 approval_oa 信息 ")
approvalOA, err := oa.copyOAToModel(in, a) approvalOA, err := oa.copyOAToModel(in, a)
if err != nil { if err != nil {
return err return err
} }
fmt.Println("============== 打印 审批内容 ========== 开始 =========")
fmt.Println("approval_oa info is : ", approvalOA)
fmt.Println("============== 打印 审批内容 ========== 结束 =========")
return DB.Create(&approvalOA).Error return DB.Create(&approvalOA).Error
} }
@ -215,6 +213,10 @@ func (oa *ApprovalOA) copyOAToModel(in *approval.CreateRequest, a *Approval) (ap
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
fmt.Println("============== 打印 审批内容 ========== 开始 =========")
fmt.Println("approval_oa info is : ", approvalOA)
fmt.Println("============== 打印 审批内容 ========== 结束 =========")
if err := oa.addOtherInfoToModel(in, a, approvalOA); err != nil { if err := oa.addOtherInfoToModel(in, a, approvalOA); err != nil {
return nil, err return nil, err
} }
@ -222,17 +224,17 @@ 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, appprovalOA *ApprovalOA) error { func (oa *ApprovalOA) 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":
appprovalOA.Leave.ApprovalUsers = a.ApprovalUsers approvalOA.Leave.ApprovalUsers = a.ApprovalUsers
appprovalOA.Leave.CopyUsers = a.CopyUsers approvalOA.Leave.CopyUsers = a.CopyUsers
if appprovalOA.Leave.ApplyType != "" { if approvalOA.Leave.ApplyType != "" {
appprovalOA.Leave.ApplyType = a.ApprovalType.KeyWord approvalOA.Leave.ApplyType = a.ApprovalType.KeyWord
} }
appprovalOA.Leave.ApprovalID = strconv.FormatUint(a.ID, 10) approvalOA.Leave.ApprovalID = strconv.FormatUint(a.ID, 10)
appprovalOA.Leave.Status = int32(a.Status) approvalOA.Leave.Status = int32(a.Status)
applyTimes := make([]ApplyTime, 0) applyTimes := make([]ApplyTime, 0)
for i := 0; i < len(in.ApprovalOA.Leave.ApplyTimes); i++ { for i := 0; i < len(in.ApprovalOA.Leave.ApplyTimes); i++ {
@ -242,13 +244,13 @@ func (oa *ApprovalOA) addOtherInfoToModel(in *approval.CreateRequest, a *Approva
M: in.ApprovalOA.Leave.ApplyTimes[i].M, M: in.ApprovalOA.Leave.ApplyTimes[i].M,
}) })
} }
appprovalOA.Leave.ApplyTimes = applyTimes approvalOA.Leave.ApplyTimes = applyTimes
case "makeUp": case "makeUp":
appprovalOA.MakeUp.ApprovalUsers = a.ApprovalUsers approvalOA.MakeUp.ApprovalUsers = a.ApprovalUsers
appprovalOA.MakeUp.CopyUsers = a.CopyUsers approvalOA.MakeUp.CopyUsers = a.CopyUsers
appprovalOA.MakeUp.ApplyType = a.ApprovalType.KeyWord approvalOA.MakeUp.ApplyType = a.ApprovalType.KeyWord
appprovalOA.MakeUp.ApprovalID = strconv.FormatUint(a.ID, 10) approvalOA.MakeUp.ApprovalID = strconv.FormatUint(a.ID, 10)
appprovalOA.MakeUp.Status = int32(a.Status) approvalOA.MakeUp.Status = int32(a.Status)
applyTimes := make([]ApplyTime, 0) applyTimes := make([]ApplyTime, 0)
for i := 0; i < len(in.ApprovalOA.MakeUp.ApplyTimes); i++ { for i := 0; i < len(in.ApprovalOA.MakeUp.ApplyTimes); i++ {
@ -258,13 +260,13 @@ func (oa *ApprovalOA) addOtherInfoToModel(in *approval.CreateRequest, a *Approva
M: in.ApprovalOA.MakeUp.ApplyTimes[i].M, M: in.ApprovalOA.MakeUp.ApplyTimes[i].M,
}) })
} }
appprovalOA.MakeUp.ApplyTimes = applyTimes approvalOA.MakeUp.ApplyTimes = applyTimes
case "overTime": case "overTime":
appprovalOA.OverTime.ApprovalUsers = a.ApprovalUsers approvalOA.OverTime.ApprovalUsers = a.ApprovalUsers
appprovalOA.OverTime.CopyUsers = a.CopyUsers approvalOA.OverTime.CopyUsers = a.CopyUsers
appprovalOA.OverTime.ApplyType = a.ApprovalType.KeyWord approvalOA.OverTime.ApplyType = a.ApprovalType.KeyWord
appprovalOA.OverTime.ApprovalID = strconv.FormatUint(a.ID, 10) approvalOA.OverTime.ApprovalID = strconv.FormatUint(a.ID, 10)
appprovalOA.OverTime.Status = int32(a.Status) approvalOA.OverTime.Status = int32(a.Status)
applyTimes := make([]ApplyTime, 0) applyTimes := make([]ApplyTime, 0)
for i := 0; i < len(in.ApprovalOA.OverTime.ApplyTimes); i++ { for i := 0; i < len(in.ApprovalOA.OverTime.ApplyTimes); i++ {
@ -274,13 +276,13 @@ func (oa *ApprovalOA) addOtherInfoToModel(in *approval.CreateRequest, a *Approva
M: in.ApprovalOA.OverTime.ApplyTimes[i].M, M: in.ApprovalOA.OverTime.ApplyTimes[i].M,
}) })
} }
appprovalOA.OverTime.ApplyTimes = applyTimes approvalOA.OverTime.ApplyTimes = applyTimes
case "outWork": case "outWork":
appprovalOA.OutWork.ApprovalUsers = a.ApprovalUsers approvalOA.OutWork.ApprovalUsers = a.ApprovalUsers
appprovalOA.OutWork.CopyUsers = a.CopyUsers approvalOA.OutWork.CopyUsers = a.CopyUsers
appprovalOA.OutWork.ApplyType = a.ApprovalType.KeyWord approvalOA.OutWork.ApplyType = a.ApprovalType.KeyWord
appprovalOA.OutWork.ApprovalID = strconv.FormatUint(a.ID, 10) approvalOA.OutWork.ApprovalID = strconv.FormatUint(a.ID, 10)
appprovalOA.OutWork.Status = int32(a.Status) approvalOA.OutWork.Status = int32(a.Status)
applyTimes := make([]ApplyTime, 0) applyTimes := make([]ApplyTime, 0)
for i := 0; i < len(in.ApprovalOA.OutWork.ApplyTimes); i++ { for i := 0; i < len(in.ApprovalOA.OutWork.ApplyTimes); i++ {
@ -290,13 +292,13 @@ func (oa *ApprovalOA) addOtherInfoToModel(in *approval.CreateRequest, a *Approva
M: in.ApprovalOA.OutWork.ApplyTimes[i].M, M: in.ApprovalOA.OutWork.ApplyTimes[i].M,
}) })
} }
appprovalOA.OutWork.ApplyTimes = applyTimes approvalOA.OutWork.ApplyTimes = applyTimes
case "turnover": case "turnover":
appprovalOA.Turnover.ApprovalUsers = a.ApprovalUsers approvalOA.Turnover.ApprovalUsers = a.ApprovalUsers
appprovalOA.Turnover.CopyUsers = a.CopyUsers approvalOA.Turnover.CopyUsers = a.CopyUsers
appprovalOA.Turnover.ApplyType = a.ApprovalType.KeyWord approvalOA.Turnover.ApplyType = a.ApprovalType.KeyWord
appprovalOA.Turnover.ApprovalID = strconv.FormatUint(a.ID, 10) approvalOA.Turnover.ApprovalID = strconv.FormatUint(a.ID, 10)
appprovalOA.Turnover.Status = int32(a.Status) approvalOA.Turnover.Status = int32(a.Status)
applyTimes := make([]ApplyTime, 0) applyTimes := make([]ApplyTime, 0)
for i := 0; i < len(in.ApprovalOA.Turnover.ApplyTimes); i++ { for i := 0; i < len(in.ApprovalOA.Turnover.ApplyTimes); i++ {
@ -306,13 +308,13 @@ func (oa *ApprovalOA) addOtherInfoToModel(in *approval.CreateRequest, a *Approva
M: in.ApprovalOA.Turnover.ApplyTimes[i].M, M: in.ApprovalOA.Turnover.ApplyTimes[i].M,
}) })
} }
appprovalOA.Turnover.ApplyTimes = applyTimes approvalOA.Turnover.ApplyTimes = applyTimes
case "leaveApply": case "leaveApply":
appprovalOA.LeaveApply.ApprovalUsers = a.ApprovalUsers approvalOA.LeaveApply.ApprovalUsers = a.ApprovalUsers
appprovalOA.LeaveApply.CopyUsers = a.CopyUsers approvalOA.LeaveApply.CopyUsers = a.CopyUsers
appprovalOA.LeaveApply.ApplyType = a.ApprovalType.KeyWord approvalOA.LeaveApply.ApplyType = a.ApprovalType.KeyWord
appprovalOA.LeaveApply.ApprovalID = strconv.FormatUint(a.ID, 10) approvalOA.LeaveApply.ApprovalID = strconv.FormatUint(a.ID, 10)
appprovalOA.LeaveApply.Status = int32(a.Status) approvalOA.LeaveApply.Status = int32(a.Status)
default: default:
return errors.New("未找到相关审批类型") return errors.New("未找到相关审批类型")
} }