diff --git a/pkg/model/approval_oa.go b/pkg/model/approval_oa.go index d8b2ad2..367b565 100644 --- a/pkg/model/approval_oa.go +++ b/pkg/model/approval_oa.go @@ -17,12 +17,12 @@ type ApprovalOA struct { CreatedAt time.Time `gorm:"column:created_at" json:"createdAt"` // 创建时间 UpdatedAt time.Time `gorm:"column:updated_at" json:"updatedAt"` // 更新时间 ApprovalID uint64 `gorm:"column:approval_id" json:"approvalID"` // 申请的id - LeaveApply *LeaveApply `json:"leaveApply" gorm:"column:leave_apply;type:json;comment:假期余额申请"` - OutWork *OutWorkApply `json:"outWork" gorm:"column:out_work;type:json;comment:外勤"` - MakeUp *MakeUpApply `json:"makeUp" gorm:"column:make_up;type:json;comment:加班"` - Turnover *TurnoverApply `json:"turnover" gorm:"column:turnover;type:json;comment:离职"` - OverTime *OverTimeApply `json:"overTime" gorm:"column:over_time;type:json;comment:加班"` - Leave *Leave `json:"leave" gorm:"column:leave;type:json;comment:请假"` + LeaveApply LeaveApply `json:"leaveApply" gorm:"column:leave_apply;type:json;comment:假期余额申请"` + OutWork OutWorkApply `json:"outWork" gorm:"column:out_work;type:json;comment:外勤"` + MakeUp MakeUpApply `json:"makeUp" gorm:"column:make_up;type:json;comment:加班"` + Turnover TurnoverApply `json:"turnover" gorm:"column:turnover;type:json;comment:离职"` + OverTime OverTimeApply `json:"overTime" gorm:"column:over_time;type:json;comment:加班"` + Leave Leave `json:"leave" gorm:"column:leave;type:json;comment:请假"` } // LeaveApply @@ -278,40 +278,38 @@ func addOtherInfoToModel(a *Approval, approvalOA *ApprovalOA) error { case "makeUp": approvalOA.MakeUp.ApprovalUsers = a.ApprovalUsers approvalOA.MakeUp.CopyUsers = a.CopyUsers - approvalOA.MakeUp.ApplyType = a.ApprovalType.KeyWord + 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 - approvalOA.OverTime.ApplyType = a.ApprovalType.KeyWord + 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 - approvalOA.OutWork.ApplyType = a.ApprovalType.KeyWord + 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 - approvalOA.Turnover.ApplyType = a.ApprovalType.KeyWord + 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 - approvalOA.LeaveApply.ApplyType = a.ApprovalType.KeyWord + approvalOA.LeaveApply.ApplyType = a.Type approvalOA.LeaveApply.ApprovalID = strconv.FormatUint(a.ID, 10) approvalOA.LeaveApply.Status = int32(a.Status) - if approvalOA.Leave.ApplyType == "" { - approvalOA.Leave.ApplyType = a.ApprovalType.KeyWord - } + default: return errors.New("未找到相关审批类型") } @@ -346,14 +344,14 @@ 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 - } + //if err := oa.addOtherInfoToRpc(a, in); err != nil { + // return err + //} return nil } -func (oa *ApprovalOA) addOtherInfoToRpc(a *Approval, in *approval.CreateRequest) error { +/*func (oa *ApprovalOA) addOtherInfoToRpc(a *Approval, in *approval.CreateRequest) error { if oa.Leave != nil { copier.CopyWithOption(&a.ApprovalOA.Leave.ApplyTimes, in.ApprovalOA.Leave.ApplyTimes, copier.Option{DeepCopy: true}) } @@ -376,7 +374,7 @@ func (oa *ApprovalOA) addOtherInfoToRpc(a *Approval, in *approval.CreateRequest) return nil } - +*/ func (oa *ApprovalOA) DeleteApproval(p *Approval) error { return DB.Where(&ApprovalOA{ApprovalID: p.ID}).Delete(&ApprovalOA{}).Error }