 liuliang
|
de6f550356
|
考勤流程设置、生成假期余额、请假流程action改造
|
7 months ago |
sy
|
5cb0c7daae
|
考勤-考勤汇总报表查询优化
|
8 months ago |
|
sy
|
6b0f1e6e6c
|
考勤-请假、出差流程，全局唯一性规则校验
|
8 months ago |
|
sy
|
94688d0d9c
|
Merge remote-tracking branch 'origin/main'
|
8 months ago |
|
sy
|
5f9fcd5a1d
|
考勤-请假流程，明细生成匹配假期优先使用级联逻辑
|
8 months ago |
|
liuliang
|
1fe80a06fd
|
新增假期发放根据离职日期入职日期折算功能、修改循环按期发放折算bug、修改一次性发放假期余额逻辑、优化查询班次逻辑
|
8 months ago |
|
sy
|
d62f2dd09d
|
考勤-日历排班，导出excel增加下拉列表，导入逻辑优化
|
8 months ago |
|
liuliang
|
732197a50e
|
半天请假拆分、全天请假拆分优化、出勤结果日历排班性能优化
|
8 months ago |
|
sy
|
c33cec2a67
|
考勤，加班计划流程明细数据生成逻辑改造，区分休息、就餐班段
|
9 months ago |
|
sy
|
ab1fed4e44
|
考勤-出勤结果分析过程，加班结果转假期余额时，只处理核算单位逻辑不处理核算量逻辑
|
9 months ago |
|
liuliang
|
bb0b5f4961
|
liuliang
|
9 months ago |
|
liuliang
|
58af4d387f
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
10 months ago |
|
liuliang
|
697b9a4287
|
离职人员校验、弹性时段
|
10 months ago |
|
sy
|
4802eea593
|
考勤-请假、出差流程，根据时间区间生成明细时，根据加班类型设置去除加班计划时段中的休息、就餐时长
|
10 months ago |
|
sy
|
521114c649
|
考勤-加班计划流程,允许非休息班次的休息时段申请加班计划
|
10 months ago |
|
sy
|
c7b660badb
|
Merge remote-tracking branch 'origin/main'
|
10 months ago |
|
liuliang
|
a1d8c1ee03
|
流程删除、流程强制收回
|
10 months ago |
|
sy
|
7b4869feda
|
Merge remote-tracking branch 'origin/main'
|
10 months ago |
|
liuliang
|
7eedcb7008
|
代理
|
10 months ago |
|
sy
|
95451caa47
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# src/com/engine/jucailinkq/attendance/workflow/service/impl/OvertimePlanServiceImpl.java
|
10 months ago |
|
sy
|
d7b410364a
|
考勤-加班计划流程,加班时长去除休息班次中的休息时段
|
10 months ago |
|
liuliang
|
9c197cb7fc
|
优化日志打印、优化假期额度发放、优化人员分组条件
|
10 months ago |
|
liuliang
|
e82542c988
|
修改sql转换
|
10 months ago |
|
liuliang
|
4018b5019b
|
排班结果优化，代码修改
|
10 months ago |
|
sy
|
ad21ed944b
|
考勤-加班计划流程，加班计划明细筛选去重逻辑增加
|
11 months ago |
|
liuliang
|
3ce7af0727
|
出勤结果加上考勤抽泣
|
11 months ago |
|
liuliang
|
aed2d8e428
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
11 months ago |
|
liuliang
|
dca1e02609
|
考勤周期
|
11 months ago |
|
sy
|
f8b8842c73
|
考勤-考勤相关流程，归档节点触发出勤结果数据状态变更功能
|
11 months ago |
|
sy
|
86f1dbeea1
|
Merge remote-tracking branch 'origin/main'
|
11 months ago |
|
sy
|
3d82396dfe
|
考勤-加班计划流程，加班计划明细中加班计划和归属日期自动匹配逻辑
|
11 months ago |
|
liuliang
|
12de1f9cbd
|
请假跨多天加班
|
11 months ago |
|
sy
|
c12cf7822d
|
Merge remote-tracking branch 'origin/main'
|
11 months ago |
|
sy
|
aa3920296c
|
考勤-批量请假，未勾选“每天重复时段请假”时的请假时长逻辑处理
|
11 months ago |
|
liuliang
|
318cb5ba39
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
11 months ago |
|
liuliang
|
54f49b6569
|
完善请假逻辑
|
11 months ago |
|
sy
|
e29da354b1
|
考勤-加班计划流程，加班计划明细数据生成接口
|
11 months ago |
|
sy
|
1fb5791768
|
考勤-批量请假，以“指定时间区间”方式请假时，增加对跨天区间请假时长的处理逻辑
|
11 months ago |
|
liuliang
|
ec4816196f
|
修改透支及假期余额bug
|
11 months ago |
|
liuliang
|
827ec85084
|
假期余额透支功能
|
11 months ago |
|
liuliang
|
a7ec5fd591
|
作用时段转班段类型
|
12 months ago |
|
liuliang
|
569ec4dc95
|
修改加班计划bug 修改假期额度发放尾数不对的bug
|
12 months ago |
|
liuliang
|
e4a57e832a
|
liuliang
|
12 months ago |
