diff --git a/pkg/model/approval_oa.go b/pkg/model/approval_oa.go index 46a66ca..0349e34 100644 --- a/pkg/model/approval_oa.go +++ b/pkg/model/approval_oa.go @@ -236,15 +236,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 @@ -252,15 +252,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 @@ -268,15 +268,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 @@ -284,15 +284,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 @@ -300,15 +300,15 @@ func (oa *ApprovalOA) addOtherInfoToModel(in *approval.CreateRequest, a *Approva 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 + //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