jiangyong
/
enterprise
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

month

This commit is contained in:
jiangyong 2025-03-22 23:56:12 +08:00
parent db62932a13
commit bca5b4c937
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/service/staff_salary.go
View File

@ -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, "", "", "") users, _, err := dao.NewStaffUserDao().Query(1, -1, sess.GetCorpId(), 0, req.Username, "", "", "")
session.CheckDBError(err) session.CheckDBError(err)
salaryLast := cast.ToInt(config.GetCorpConfig(sess.GetCorpId(), "salary_latest", 31)) 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))) panic(config.ErrTimeExceed.New().Append(fmt.Sprintf("salaryLast=%d", salaryLast)))
} }

5
service/staff_salary.go
View File

@ -287,6 +287,11 @@ func (s *StaffSalary) getRealWorkDay(month string) float64 {
} }
func (s *StaffSalary) getTotalWorkDay(corpId int64, username, month string) int64 { 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) checkins, _ := dao.NewCheckinDao().Query(corpId, username, month, false)
return int64(len(checkins)) return int64(len(checkins))
} }