From bca5b4c937503d9ec340470dc032d9703ce96a8b Mon Sep 17 00:00:00 2001 From: jiangyong Date: Sat, 22 Mar 2025 23:56:12 +0800 Subject: [PATCH] month --- server/service/staff_salary.go | 6 +++++- service/staff_salary.go | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/server/service/staff_salary.go b/server/service/staff_salary.go index bbd5036..00eedcf 100644 --- a/server/service/staff_salary.go +++ b/server/service/staff_salary.go @@ -66,7 +66,11 @@ func (s *StaffSalary) Create(sess *session.AdminSession, req *api.CreateSalaryRe users, _, err := dao.NewStaffUserDao().Query(1, -1, sess.GetCorpId(), 0, req.Username, "", "", "") session.CheckDBError(err) salaryLast := cast.ToInt(config.GetCorpConfig(sess.GetCorpId(), "salary_latest", 31)) - if time.Now().Day() >= salaryLast || cast.ToInt(req.Month) != cast.ToInt(time.Now().AddDate(0, -1, 0).Format("200601")) { + + lastMonth := cast.ToInt(time.Now().AddDate(0, -1, 0).Format("200601")) + if cast.ToInt(req.Month) < lastMonth || + (cast.ToInt(req.Month) == lastMonth && time.Now().Day() > salaryLast) || + cast.ToInt(req.Month) > lastMonth { panic(config.ErrTimeExceed.New().Append(fmt.Sprintf("salaryLast=%d", salaryLast))) } diff --git a/service/staff_salary.go b/service/staff_salary.go index 9956cd7..1b730bd 100644 --- a/service/staff_salary.go +++ b/service/staff_salary.go @@ -287,6 +287,11 @@ func (s *StaffSalary) getRealWorkDay(month string) float64 { } func (s *StaffSalary) getTotalWorkDay(corpId int64, username, month string) int64 { + //当月的应出勤天数按22天算 + if cast.ToInt(month) >= cast.ToInt(time.Now().Format("200601")) { + return 22 + } + checkins, _ := dao.NewCheckinDao().Query(corpId, username, month, false) return int64(len(checkins)) }