diff --git a/cmd/enterprise.go b/cmd/enterprise.go index 11341e1..420e40f 100644 --- a/cmd/enterprise.go +++ b/cmd/enterprise.go @@ -3,6 +3,7 @@ package main import ( "enterprise/common/config" "enterprise/common/global" + "enterprise/common/model" "enterprise/server" _ "enterprise/service/salary_calculator" "enterprise/worker" @@ -15,6 +16,9 @@ func main() { worker.InitCorp() + approve := worker.NewApproval(1002) + approve.Sync("202502", model.ApprovalTypeVacation) + if err := server.Start(); err != nil { panic(err) } diff --git a/worker/approval.go b/worker/approval.go index 5c45bb3..16145b4 100644 --- a/worker/approval.go +++ b/worker/approval.go @@ -34,8 +34,8 @@ func (s *Approval) getTemplateId(tp string) string { return "" } -func (s *Approval) Sync(corpId int64, month, tp string) { - corp, err := dao.NewCorpDao().Get(corpId) +func (s *Approval) Sync(month, tp string) { + corp, err := dao.NewCorpDao().Get(s.corp.Id) if err != nil { log.Errorf("db error:%s", err.Error()) return diff --git a/worker/worker.go b/worker/worker.go index 7f3ca62..8fb0756 100644 --- a/worker/worker.go +++ b/worker/worker.go @@ -36,10 +36,10 @@ func InitCorp1002(cron *gocron.Scheduler) { lastMonth := time.Now().AddDate(0, -1, 0).Format("200601") approve := NewApproval(corpId) - approve.Sync(corpId, lastMonth, model.ApprovalTypeCheckin) - approve.Sync(corpId, lastMonth, model.ApprovalTypeVacation) - approve.Sync(corpId, lastMonth, model.ApprovalTypeRefund) - approve.Sync(corpId, lastMonth, model.ApprovalTypePayment) + approve.Sync(lastMonth, model.ApprovalTypeCheckin) + approve.Sync(lastMonth, model.ApprovalTypeVacation) + approve.Sync(lastMonth, model.ApprovalTypeRefund) + approve.Sync(lastMonth, model.ApprovalTypePayment) }) // 1号计算工资信息 @@ -79,10 +79,10 @@ func InitCorp1000(cron *gocron.Scheduler) { lastMonth := time.Now().AddDate(0, -1, 0).Format("200601") approve := NewApproval(corpId) - approve.Sync(corpId, lastMonth, model.ApprovalTypeCheckin) - approve.Sync(corpId, lastMonth, model.ApprovalTypeVacation) - approve.Sync(corpId, lastMonth, model.ApprovalTypeRefund) - approve.Sync(corpId, lastMonth, model.ApprovalTypePayment) + approve.Sync(lastMonth, model.ApprovalTypeCheckin) + approve.Sync(lastMonth, model.ApprovalTypeVacation) + approve.Sync(lastMonth, model.ApprovalTypeRefund) + approve.Sync(lastMonth, model.ApprovalTypePayment) }) // 1号计算工资信息