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

修改导入包名

Browse Source
This commit is contained in:
luyanming 2023-06-21 15:04:45 +08:00
parent 59a540080e
commit fbdd1f8015
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pkg/model/approval_oa.go
View File

@ -5,8 +5,8 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"github.com/fonchain_enterprise/fonchain-approval/api/approval" "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval"
m2 "github.com/fonchain_enterprise/fonchain-approval/pkg/m" m2 "github.com/fonchain_enterprise/fonchain-approval-fork/pkg/m"
"github.com/jinzhu/copier" "github.com/jinzhu/copier"
"gorm.io/plugin/soft_delete" "gorm.io/plugin/soft_delete"
"strconv" "strconv"
@ -464,29 +464,30 @@ func (oa *ApprovalOA) copyOAToRpc(a *Approval, request *approval.CreateRequest)
return nil return nil
} }
/*func (oa *ApprovalOA) addOtherInfoToRpc(a *Approval, in *approval.CreateRequest) error { /*
if oa.Leave != nil { func (oa *ApprovalOA) addOtherInfoToRpc(a *Approval, in *approval.CreateRequest) error {
copier.CopyWithOption(&a.ApprovalOA.Leave.ApplyTimes, in.ApprovalOA.Leave.ApplyTimes, copier.Option{DeepCopy: true}) if oa.Leave != nil {
} copier.CopyWithOption(&a.ApprovalOA.Leave.ApplyTimes, in.ApprovalOA.Leave.ApplyTimes, copier.Option{DeepCopy: true})
}
if oa.MakeUp != nil { if oa.MakeUp != nil {
copier.CopyWithOption(&a.ApprovalOA.MakeUp.ApplyTimes, in.ApprovalOA.MakeUp.ApplyTimes, copier.Option{DeepCopy: true}) copier.CopyWithOption(&a.ApprovalOA.MakeUp.ApplyTimes, in.ApprovalOA.MakeUp.ApplyTimes, copier.Option{DeepCopy: true})
} }
if oa.Turnover != nil { if oa.Turnover != nil {
copier.CopyWithOption(&a.ApprovalOA.Turnover.ApplyTimes, in.ApprovalOA.Turnover.ApplyTimes, copier.Option{DeepCopy: true}) copier.CopyWithOption(&a.ApprovalOA.Turnover.ApplyTimes, in.ApprovalOA.Turnover.ApplyTimes, copier.Option{DeepCopy: true})
} }
if oa.OverTime != nil { if oa.OverTime != nil {
copier.CopyWithOption(&a.ApprovalOA.OverTime.ApplyTimes, in.ApprovalOA.OverTime.ApplyTimes, copier.Option{DeepCopy: true}) copier.CopyWithOption(&a.ApprovalOA.OverTime.ApplyTimes, in.ApprovalOA.OverTime.ApplyTimes, copier.Option{DeepCopy: true})
} }
if oa.OutWork != nil { if oa.OutWork != nil {
copier.CopyWithOption(&a.ApprovalOA.OutWork.ApplyTimes, in.ApprovalOA.OutWork.ApplyTimes, copier.Option{DeepCopy: true}) copier.CopyWithOption(&a.ApprovalOA.OutWork.ApplyTimes, in.ApprovalOA.OutWork.ApplyTimes, copier.Option{DeepCopy: true})
} }
return nil return nil
} }
*/ */
func (oa *ApprovalOA) DeleteApproval(p *Approval) error { func (oa *ApprovalOA) DeleteApproval(p *Approval) error {
return DB.Where(&ApprovalOA{ApprovalID: p.ID}).Delete(&ApprovalOA{}).Error return DB.Where(&ApprovalOA{ApprovalID: p.ID}).Delete(&ApprovalOA{}).Error

4
pkg/model/approval_setting.go
View File

@ -3,7 +3,7 @@ package model
import ( import (
"database/sql/driver" "database/sql/driver"
"encoding/json" "encoding/json"
"github.com/fonchain_enterprise/fonchain-approval/api/approval" "github.com/fonchain_enterprise/fonchain-approval-fork/api/approval"
"gorm.io/plugin/soft_delete" "gorm.io/plugin/soft_delete"
"time" "time"
) )
@ -108,7 +108,7 @@ func FormatApproveUsers(copyUsers []*approval.ApprovalUser) ApprovalUsers {
return res return res
} }
//GetCombineApproveUsers 混合获取 // GetCombineApproveUsers 混合获取
func (m *ApprovalSetting) GetCombineApproveUsers(approvalUser []ApprovalUser) []ApprovalUser { func (m *ApprovalSetting) GetCombineApproveUsers(approvalUser []ApprovalUser) []ApprovalUser {
approvalUserMap := make(map[uint64]struct{}) approvalUserMap := make(map[uint64]struct{})