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
|
7ea587d54e
|
Merge remote-tracking branch 'origin/main'
|
8 months ago |
|
liuliang
|
1b106d762c
|
代理
|
8 months ago |
|
sy
|
d30257719b
|
Merge remote-tracking branch 'origin/main'
|
8 months ago |
|
liuliang
|
22d6d7c8b9
|
代理
|
8 months ago |
|
sy
|
74c82a751c
|
Merge remote-tracking branch 'origin/main'
|
8 months ago |
|
liuliang
|
70918f2cf7
|
代理类
|
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
|
0dab7a9349
|
修改打印日志
|
8 months ago |
|
liuliang
|
9c197cb7fc
|
优化日志打印、优化假期额度发放、优化人员分组条件
|
8 months ago |
|
sy
|
5d3b9aefbe
|
Merge remote-tracking branch 'origin/main'
|
8 months ago |
|
liuliang
|
f238ff4a45
|
修改加班超出逻辑
|
8 months ago |
|
sy
|
21f100065d
|
Merge remote-tracking branch 'origin/main'
|
8 months ago |
|
liuliang
|
e82542c988
|
修改sql转换
|
8 months ago |
|
sy
|
fabec17ae4
|
Merge remote-tracking branch 'origin/main'
|
8 months ago |
|
sy
|
11798f0260
|
考勤-加班计划流程,加班最小分钟数校验逻辑
|
8 months ago |
|
liuliang
|
4018b5019b
|
排班结果优化，代码修改
|
8 months ago |
|
sy
|
59d2142327
|
考勤-出差流程，出差明细生成逻辑优化，修复时长累加问题
|
8 months ago |
|
sy
|
0a74b875fb
|
考勤-批量请假流程，请假明细生成逻辑优化，修复时长累加问题
|
8 months ago |
|
sy
|
877476efc0
|
考勤-考勤汇总报表查询，分权逻辑中人员类型获取优化
|
8 months ago |
|
sy
|
4c91cd0ac8
|
考勤-加班计划流程，加班计划区间允许与休息班次区间出现重叠；修复请假、出差明细生成bug
|
8 months ago |
|
sy
|
ad21ed944b
|
考勤-加班计划流程，加班计划明细筛选去重逻辑增加
|
9 months ago |
|
liuliang
|
d687c16247
|
迟到精确到分钟
|
9 months ago |
|
sy
|
e881a8ff7e
|
11
|
9 months ago |
|
sy
|
fab1bdda7d
|
考勤-出差流程，明细数据生成接口
|
9 months ago |
|
liuliang
|
320c506901
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
9 months ago |
|
liuliang
|
d728e6ce5b
|
加班拆分
|
9 months ago |
|
sy
|
5b1ee79780
|
考勤-出差流程，明细数据生成功能
|
9 months ago |
|
sy
|
d2b2a22be0
|
Merge remote-tracking branch 'origin/main'
|
9 months ago |
|
sy
|
6fbdc521e8
|
考勤-考勤周期，自动关账定时任务
|
9 months ago |
|
liuliang
|
0b5345062e
|
1
|
9 months ago |
|
liuliang
|
84bd22e9c9
|
11
|
9 months ago |
|
sy
|
2676f707c1
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
9 months ago |
|
sy
|
43017408ae
|
11
|
9 months ago |
|
liuliang
|
3ce7af0727
|
出勤结果加上考勤抽泣
|
9 months ago |
|
sy
|
021d2afe3e
|
Merge remote-tracking branch 'origin/main'
|
9 months ago |
|
sy
|
5a4e6af0a0
|
考勤-考勤相关流程，批准节点触发考勤周期是否结账校验
|
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
|
a8ff90dee3
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
9 months ago |
|
sy
|
d57bd01c94
|
考勤-津贴确认流程，津贴数据状态变更功能
|
9 months ago |
|
liuliang
|
6942e4a80d
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
9 months ago |
|
liuliang
|
9e4be3a544
|
日历排班优化、出差优化
|
9 months ago |
|
sy
|
30564d19ab
|
考勤-批量请假，重复点击生成明细按钮时，增加以编辑明细的开始日期的重复校验
|
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
|
fa7122f724
|
考勤-批量请假，以“指定时间区间”方式请假时，跨天区间请假时长,同时班段跨天的处理逻辑改造
|
9 months ago |
|
sy
|
1fb5791768
|
考勤-批量请假，以“指定时间区间”方式请假时，增加对跨天区间请假时长的处理逻辑
|
9 months ago |
|
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
|
漏卡转旷工
|
9 months ago |
|
sy
|
88e44bc602
|
考勤-出勤汇总报表，查询结果中“正常”考勤项目根据核算单位区分汇总数据
|
10 months ago |
|
sy
|
6968fef009
|
考勤-批量请假，明细表1数据生成按钮接口、批量请假流程节点action中未休时长数据更新逻辑优化
|
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 |
