luyanming
/
fonchain-approval-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

Browse Source
main
jhc 1 year ago
parent a24a215b35
commit 0ec7533677
1 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File

72
pkg/model/approval_oa.go
Unescape Escape View File

@ -241,15 +241,15 @@ func (oa *ApprovalOA) addOtherInfoToModel(in *approval.CreateRequest, a *Approva
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
//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
@ -257,15 +257,15 @@ func (oa *ApprovalOA) addOtherInfoToModel(in *approval.CreateRequest, a *Approva
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
//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
@ -273,15 +273,15 @@ func (oa *ApprovalOA) addOtherInfoToModel(in *approval.CreateRequest, a *Approva
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
//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
@ -289,15 +289,15 @@ func (oa *ApprovalOA) addOtherInfoToModel(in *approval.CreateRequest, a *Approva
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
//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

Write Preview
Loading…
Cancel
Save