 liuliang
|
045010e632
|
半天请假拆分、全天请假拆分优化、出勤结果日历排班性能优化
|
6 months ago |
|
liuliang
|
7c3a551c85
|
修改弹性请假摆卡问题，优化性能
|
6 months ago |
|
liuliang
|
9bb573d410
|
修复考勤方案bug
|
6 months ago |
|
liuliang
|
3be84ab80d
|
1
|
6 months ago |
sy
|
afda2cf7c0
|
Merge remote-tracking branch 'origin/main'
|
6 months ago |
|
sy
|
5e58a6f328
|
考勤-出勤汇总报表，查询数据源调整为考勤日报视图，增加查询入参
|
6 months ago |
|
liuliang
|
e2db2fbe60
|
加班时长核算修改
|
6 months ago |
|
liuliang
|
732197a50e
|
半天请假拆分、全天请假拆分优化、出勤结果日历排班性能优化
|
6 months ago |
|
liuliang
|
835f5befcf
|
出勤结果逻辑修复
|
6 months ago |
|
sy
|
16e3c91ccd
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# hrm-attendance.iml
|
7 months ago |
|
sy
|
c33cec2a67
|
考勤，加班计划流程明细数据生成逻辑改造，区分休息、就餐班段
|
7 months ago |
|
liuliang
|
97564618d7
|
扣除加班休息时长
|
7 months ago |
|
liuliang
|
7180c4de28
|
休息班段请假合并
|
7 months ago |
|
liuliang
|
ee437cc927
|
全体假、半天假
|
7 months ago |
|
sy
|
d0dd06ff21
|
考勤-出勤汇总报表，统计时长保留两位小数
|
7 months ago |
|
sy
|
ab1fed4e44
|
考勤-出勤结果分析过程，加班结果转假期余额时，只处理核算单位逻辑不处理核算量逻辑
|
7 months ago |
|
liuliang
|
9844354412
|
liuliang
|
7 months ago |
|
liuliang
|
6fcbc77b70
|
ll
|
7 months ago |
|
liuliang
|
bb0b5f4961
|
liuliang
|
7 months ago |
|
sy
|
cd27abbdd9
|
考勤，出勤分析加班时长统计优化，补打卡流程补打卡次数校验优化，企业日历排班结果查询权限逻辑优化
|
7 months ago |
|
sy
|
b2c2f211b9
|
考勤-加班计划流程，退回action、删除流程附加加班计划和加班结果删除逻辑
|
8 months ago |
|
sy
|
cc0a7f53ea
|
考勤-加班计划流程，加班累计小时数考虑加班计划数据，提交节点增加已存在加班计划和班次时段重叠校验
|
8 months ago |
|
liuliang
|
58af4d387f
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
8 months ago |
|
liuliang
|
697b9a4287
|
离职人员校验、弹性时段
|
8 months ago |
|
sy
|
4802eea593
|
考勤-请假、出差流程，根据时间区间生成明细时，根据加班类型设置去除加班计划时段中的休息、就餐时长
|
8 months ago |
|
sy
|
333bbf1ac4
|
考勤-调动分组流程，提交、归档action,考勤周期关账计划任务增加结账逻辑
|
8 months ago |
|
liuliang
|
6bab56ea62
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
8 months ago |
|
liuliang
|
b1506101e8
|
漏打卡增加作用时段，加班考虑弹性
|
8 months ago |
|
sy
|
44a84f958a
|
考勤-请假流程，退回时，清空明细表1和明细表2数据
|
8 months ago |
|
liuliang
|
5dba6041f9
|
批量流程代理
|
8 months ago |
|
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
|
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
|
9 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使用优化
|
10 months ago |
|
sy
|
a20a47ad4e
|
考勤-批量请假，以“指定时间区间”方式请假时，请假时长优先从考勤项目的作用时段关联的班段时长累计获得
|
10 months ago |
|
liuliang
|
c75c04de37
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
10 months ago |
|
liuliang
|
569ec4dc95
|
修改加班计划bug 修改假期额度发放尾数不对的bug
|
10 months ago |
|
sy
|
562ccad27f
|
考勤-批量请假，假期预支逻辑中可预支假期记录筛选逻辑变更为延期失效日期最晚的
|
10 months ago |
