sy
|
521114c649
|
考勤-加班计划流程,允许非休息班次的休息时段申请加班计划
|
8 months ago |
|
sy
|
c7b660badb
|
Merge remote-tracking branch 'origin/main'
|
8 months ago |
 liuliang
|
a1d8c1ee03
|
流程删除、流程强制收回
|
8 months ago |
|
sy
|
7b4869feda
|
Merge remote-tracking branch 'origin/main'
|
8 months ago |
|
liuliang
|
7eedcb7008
|
代理
|
8 months ago |
|
sy
|
95451caa47
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# src/com/engine/jucailinkq/attendance/workflow/service/impl/OvertimePlanServiceImpl.java
|
8 months ago |
|
sy
|
d7b410364a
|
考勤-加班计划流程,加班时长去除休息班次中的休息时段
|
8 months ago |
|
liuliang
|
9c197cb7fc
|
优化日志打印、优化假期额度发放、优化人员分组条件
|
8 months ago |
|
liuliang
|
e82542c988
|
修改sql转换
|
8 months ago |
|
liuliang
|
4018b5019b
|
排班结果优化，代码修改
|
8 months ago |
|
sy
|
ad21ed944b
|
考勤-加班计划流程，加班计划明细筛选去重逻辑增加
|
9 months ago |
|
liuliang
|
3ce7af0727
|
出勤结果加上考勤抽泣
|
9 months ago |
|
liuliang
|
aed2d8e428
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
9 months ago |
|
liuliang
|
dca1e02609
|
考勤周期
|
9 months ago |
|
sy
|
f8b8842c73
|
考勤-考勤相关流程，归档节点触发出勤结果数据状态变更功能
|
9 months ago |
|
sy
|
86f1dbeea1
|
Merge remote-tracking branch 'origin/main'
|
9 months ago |
|
sy
|
3d82396dfe
|
考勤-加班计划流程，加班计划明细中加班计划和归属日期自动匹配逻辑
|
9 months ago |
|
liuliang
|
12de1f9cbd
|
请假跨多天加班
|
9 months ago |
|
sy
|
c12cf7822d
|
Merge remote-tracking branch 'origin/main'
|
9 months ago |
|
sy
|
aa3920296c
|
考勤-批量请假，未勾选“每天重复时段请假”时的请假时长逻辑处理
|
9 months ago |
|
liuliang
|
318cb5ba39
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
9 months ago |
|
liuliang
|
54f49b6569
|
完善请假逻辑
|
9 months ago |
|
sy
|
e29da354b1
|
考勤-加班计划流程，加班计划明细数据生成接口
|
9 months ago |
|
sy
|
1fb5791768
|
考勤-批量请假，以“指定时间区间”方式请假时，增加对跨天区间请假时长的处理逻辑
|
9 months ago |
|
liuliang
|
ec4816196f
|
修改透支及假期余额bug
|
9 months ago |
|
liuliang
|
827ec85084
|
假期余额透支功能
|
9 months ago |
|
liuliang
|
a7ec5fd591
|
作用时段转班段类型
|
9 months ago |
|
liuliang
|
569ec4dc95
|
修改加班计划bug 修改假期额度发放尾数不对的bug
|
9 months ago |
|
liuliang
|
e4a57e832a
|
liuliang
|
10 months ago |
