From ca7c87bb6d9c084bc6a2ab30ff29a1eff252d851 Mon Sep 17 00:00:00 2001 From: jiangyong Date: Wed, 5 Mar 2025 23:03:21 +0800 Subject: [PATCH] workerhour --- common/model/approval_vacation.go | 2 +- common/model/corp.go | 1 + server/service/qyweixin_approve.go | 1 + worker/approval.go | 3 +++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/common/model/approval_vacation.go b/common/model/approval_vacation.go index 7cab79b..103bc37 100644 --- a/common/model/approval_vacation.go +++ b/common/model/approval_vacation.go @@ -38,7 +38,7 @@ func (vacation *ApprovalVacation) From(d *qyweixin.ApproveDetail) { vacation.VacationDate = goutil.TimeToDate(dTime) vacation.VacationStartTime = goutil.TimeToDateTime(cast.ToInt64(fields[1])) vacation.VacationEndTime = goutil.TimeToDateTime(cast.ToInt64(fields[2])) - vacation.VacationDuration = float64(cast.ToInt64(fields[3])) / float64(3600*8) + vacation.VacationDuration = float64(cast.ToInt64(fields[3])) vacation.VacationRemark = d.GetValue("请假事由") vacation.Month = time.Unix(dTime, 0).Format("200601") } diff --git a/common/model/corp.go b/common/model/corp.go index 0173c34..c308a83 100644 --- a/common/model/corp.go +++ b/common/model/corp.go @@ -17,6 +17,7 @@ type CorpConfig struct { SocialDeduct string `json:"social_deduct"` HouseDeduct string `json:"house_deduct"` + WorkerHouer string `json:"worker_houer"` } type Corp struct { diff --git a/server/service/qyweixin_approve.go b/server/service/qyweixin_approve.go index 73e4b7c..26ac1e8 100644 --- a/server/service/qyweixin_approve.go +++ b/server/service/qyweixin_approve.go @@ -136,6 +136,7 @@ func (a *Approve) handleVacation(detail *qyweixin.ApproveDetail, spStatus int) { newData := new(model.ApprovalVacation) newData.From(detail) newData.CorpId = a.corp.Id + newData.VacationDuration = newData.VacationDuration / cast.ToFloat64(a.corp.GetConfig().WorkerHouer) dbDao := dao.NewApprovalVacationDao() old, err := dbDao.GetBySpNo(a.corp.Id, detail.SpNo) diff --git a/worker/approval.go b/worker/approval.go index 2c551c7..5c45bb3 100644 --- a/worker/approval.go +++ b/worker/approval.go @@ -5,6 +5,7 @@ import ( "enterprise/common/model" "git.u8t.cn/open/gosdk/qyweixin" log "github.com/sirupsen/logrus" + "github.com/spf13/cast" "time" ) @@ -138,6 +139,8 @@ func (s *Approval) saveVacation(detail *qyweixin.ApproveDetail) { dbDao := dao.NewApprovalVacationDao() newData := new(model.ApprovalVacation) newData.From(detail) + newData.VacationDuration = newData.VacationDuration / cast.ToFloat64(s.corpConfig.WorkerHouer) + old, err := dbDao.GetBySpNo(s.corp.Id, detail.SpNo) if err != nil { log.Errorf("db error :%s", err.Error())