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

dd

This commit is contained in:
jiangyong27 2024-12-03 16:47:45 +08:00
parent f2be0d19f2
commit bcc81e7ce3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/server.conf.dev
View File

@ -12,7 +12,7 @@ db = "enterprise"
[unify_mysql] [unify_mysql]
host = "192.168.2.50" host = "192.168.2.50"
port = 13307 port = 23307
user = "unify" user = "unify"
pass = "MDE2LCJIYXNoSWQiOjY" pass = "MDE2LCJIYXNoSWQiOjY"
db = "unify" db = "unify"

8
service/staff.go
View File

@ -272,10 +272,10 @@ func (s *Staff) getRealWorkDay(entryDate, leaveDate, username, month string) flo
} }
////有请假申请的不算出勤 ////有请假申请的不算出勤
//approvalVacation, _ := dao.NewApprovalVacationDao().GetByUsernameDay(username, checkin.Day) approvalVacation, _ := dao.NewApprovalVacationDao().GetByUsernameDay(username, checkin.Day)
//if approvalVacation != nil { if approvalVacation != nil {
// continue continue
//} }
// 迟到的按时间折算 // 迟到的按时间折算
if strings.Contains(checkin.Exception, "上班打卡:时间异常") { if strings.Contains(checkin.Exception, "上班打卡:时间异常") {