calculator3
This commit is contained in:
parent
5b596a9a0f
commit
3728cf6c47
|
@ -67,6 +67,14 @@ func (s *StaffSalary) Create(sess *session.AdminSession, req *api.CreateSalaryRe
|
||||||
session.CheckDBError(err)
|
session.CheckDBError(err)
|
||||||
|
|
||||||
for _, user := range users {
|
for _, user := range users {
|
||||||
|
//离职的且离职时间不在当月的不在计算工资
|
||||||
|
if user.Status == model.StaffUserStatusOffline {
|
||||||
|
leaveDate, _ := time.ParseInLocation("2006-01-02", user.LeaveDate, time.Local)
|
||||||
|
if leaveDate.Month() != time.Now().Month() {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
salary, err := dao.NewStaffSalaryDao().GetBy(sess.GetCorpId(), user.Id, req.Month)
|
salary, err := dao.NewStaffSalaryDao().GetBy(sess.GetCorpId(), user.Id, req.Month)
|
||||||
session.CheckDBError(err)
|
session.CheckDBError(err)
|
||||||
salaryServ := CommonService.NewStaffSalary(user)
|
salaryServ := CommonService.NewStaffSalary(user)
|
||||||
|
|
Loading…
Reference in New Issue