 liuliang
|
ea9153f420
|
修改加班匹配异常bug，假期余额增加离职后根据离职日期折算功能
|
6 months ago |
sy
|
3fb003f146
|
Merge remote-tracking branch 'origin/main'
|
6 months ago |
|
sy
|
d62f2dd09d
|
考勤-日历排班，导出excel增加下拉列表，导入逻辑优化
|
6 months ago |
|
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
|
ec7a881d68
|
流程前端
|
6 months ago |
|
liuliang
|
835f5befcf
|
出勤结果逻辑修复
|
6 months ago |
|
sy
|
16e3c91ccd
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# hrm-attendance.iml
|
7 months ago |
|
sy
|
0e37250a50
|
考勤
|
7 months ago |
|
sy
|
c33cec2a67
|
考勤，加班计划流程明细数据生成逻辑改造，区分休息、就餐班段
|
7 months ago |
|
liuliang
|
97564618d7
|
扣除加班休息时长
|
7 months ago |
|
liuliang
|
7180c4de28
|
休息班段请假合并
|
7 months ago |
|
liuliang
|
080a8440cc
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
7 months ago |
|
liuliang
|
ee437cc927
|
全体假、半天假
|
7 months ago |
|
sy
|
be540dbd51
|
考勤，适用范围数据删除功能
|
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 |
