sy
|
0c6fb3f1c4
|
Merge remote-tracking branch 'origin/main'
|
9 months ago |
sy
|
31387ecda0
|
考勤-批量请假,班次数据获取逻辑优化
|
9 months ago |
liuliang
|
ec4816196f
|
修改透支及假期余额bug
|
9 months ago |
liuliang
|
827ec85084
|
假期余额透支功能
|
9 months ago |
sy
|
e6553dcab4
|
考勤-批量请假,同一假期类别多条假期余额记录拼接时长时,总时长统计逻辑优化
|
9 months ago |
sy
|
998a31dad9
|
考勤,recordset使用优化
|
9 months ago |
sy
|
a20a47ad4e
|
考勤-批量请假,以“指定时间区间”方式请假时,请假时长优先从考勤项目的作用时段关联的班段时长累计获得
|
9 months ago |
liuliang
|
a7ec5fd591
|
作用时段转班段类型
|
9 months ago |
liuliang
|
c75c04de37
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
9 months ago |
liuliang
|
569ec4dc95
|
修改加班计划bug 修改假期额度发放尾数不对的bug
|
9 months ago |
sy
|
562ccad27f
|
考勤-批量请假,假期预支逻辑中可预支假期记录筛选逻辑变更为延期失效日期最晚的
|
9 months ago |
sy
|
3d59ef9024
|
Merge remote-tracking branch 'origin/main'
|
9 months ago |
sy
|
c960872248
|
考勤-批量请假,增加假期预支逻辑
|
9 months ago |
liuliang
|
7b5977b8ca
|
漏卡转旷工
|
10 months ago |
sy
|
88e44bc602
|
考勤-出勤汇总报表,查询结果中“正常”考勤项目根据核算单位区分汇总数据
|
10 months ago |
sy
|
6968fef009
|
考勤-批量请假,明细表1数据生成按钮接口、批量请假流程节点action中未休时长数据更新逻辑优化
|
10 months ago |
liuliang
|
79c9938018
|
liuliang
|
10 months ago |
sy
|
73a111fc3c
|
考勤-批量请假,明细表1数据生成按钮接口逻辑优化,指定区间时长计算问题处理
|
10 months ago |
liuliang
|
e4a57e832a
|
liuliang
|
10 months ago |
sy
|
3ea2b67ffb
|
Merge remote-tracking branch 'origin/main'
|
10 months ago |
sy
|
d5c1c6cdec
|
考勤,津贴数据生成功能需求变更,加班时长获取规则变化
|
10 months ago |
liuliang
|
248266a8e9
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
10 months ago |
liuliang
|
42fdd4d986
|
liuliang
|
10 months ago |
sy
|
68a3df7b1f
|
Merge remote-tracking branch 'origin/main'
|
10 months ago |
sy
|
5c150fa3f1
|
考勤-批量请假,明细表1数据生成按钮接口逻辑优化
|
10 months ago |
liuliang
|
cb829cc11a
|
修改出勤结果逻辑
|
10 months ago |
liuliang
|
9107be551e
|
修改bug
|
10 months ago |
sy
|
9b526d31a7
|
考勤-批量请假,明细表1数据生成按钮接口逻辑优化,增加姓名和假期名称返回
|
10 months ago |
sy
|
abf310ecd3
|
Merge remote-tracking branch 'origin/main'
|
10 months ago |
sy
|
10475db6b3
|
考勤-批量请假,明细表1数据生成按钮接口逻辑优化
|
10 months ago |
liuliang
|
c644e2a0ea
|
删除排班结果功能
|
10 months ago |
sy
|
da82ed1d41
|
Merge remote-tracking branch 'origin/main'
|
10 months ago |
sy
|
eb6d761f4e
|
考勤-批量请假,明细表1数据生成按钮接口、批量请假流程节点action开发
|
10 months ago |
liuliang
|
54ef963716
|
排班结果过期以及使用范围没有其他人的情况
|
10 months ago |
liuliang
|
d7e19bcba3
|
修改合并班段未考虑请假出差的情况
|
10 months ago |
sy
|
94a0df2a17
|
Merge remote-tracking branch 'origin/main'
|
10 months ago |
sy
|
f23c191c73
|
考勤,考勤日报相关视图刷新功能中针对考勤项目id为1时特殊处理
|
10 months ago |
liuliang
|
0a0cacca12
|
考勤假期拆分、休息班次生效加班计划、修改请假出差bug
|
10 months ago |
liuliang
|
138fc5c71b
|
请假拆分
|
10 months ago |
liuliang
|
215e22fa6c
|
liuliang
|
10 months ago |
liuliang
|
30126332d0
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
10 months ago |
liuliang
|
dd50a64bb2
|
liuliang
|
10 months ago |
sy
|
dce81e8d7e
|
考勤,考勤日报相关视图刷新功能中查询逻辑增加班次字段
|
10 months ago |
sy
|
3b08141f04
|
考勤,考勤日报相关视图刷新功能中生成sql分组逻辑增加班次字段
|
10 months ago |
sy
|
de1fd1bed3
|
考勤,考勤日报相关视图刷新功能中增加班次字段
|
10 months ago |
liuliang
|
63ae8376b5
|
优化加班
|
10 months ago |
liuliang
|
cea2e95b65
|
liuliang
|
10 months ago |
sy
|
7ffed5f24e
|
Merge remote-tracking branch 'origin/main'
|
10 months ago |
sy
|
4cff17a919
|
考勤,出勤津贴数据生成功能中增加“加班时长计入核算量”字段相关逻辑
|
10 months ago |
liuliang
|
280a4d8a11
|
调整流程
|
10 months ago |