 seaon
|
bfac08c292
|
请假流程JS调整
|
5 months ago |
|
seaon
|
d7931f1a8b
|
请假流程JS调整
|
5 months ago |
|
seaon
|
cb9d650ed8
|
请假流程JS调整
|
5 months ago |
|
seaon
|
34f6bcd014
|
请假流程JS调整
|
5 months ago |
sy
|
2ee62b3f82
|
Merge remote-tracking branch 'origin/main'
|
5 months ago |
|
sy
|
de33cf1fac
|
考勤-请假、出差明细生成，全局唯一性规则校验增加请假与出差之间的冲突情况
|
5 months ago |
|
seaon
|
3212bcbed8
|
请假流程JS调整
|
5 months ago |
|
sy
|
489bacad72
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# src/com/engine/jucailinkq/attendance/workflow/action/askforleave/BatchAskForLeaveWorkFlowSubmitAction.java
|
5 months ago |
|
sy
|
687a8787b5
|
考勤-请假明细生成功能改造，请假时长参考班次额定时长信息进行设置
|
5 months ago |
 liuliang
|
4aa022373a
|
出勤分析适配人员部门变化
|
5 months ago |
|
liuliang
|
ec483e255d
|
出勤分析整体性能优化
|
5 months ago |
|
liuliang
|
de6f550356
|
考勤流程设置、生成假期余额、请假流程action改造
|
5 months ago |
|
liuliang
|
909cbe0a6a
|
假期额度间隔时长新增直接取工龄、优化取卡逻辑
|
5 months ago |
|
sy
|
a4ef470a28
|
考勤-加班计划流程提交节点action增加加班区间重叠校验
|
5 months ago |
|
sy
|
160ad5d0ab
|
考勤-请假流程请假明细假期余额失效期优先使用
|
5 months ago |
|
sy
|
e3fa2b207d
|
考勤-请假流程提交action逻辑优化
|
5 months ago |
|
sy
|
5cb0c7daae
|
考勤-考勤汇总报表查询优化
|
5 months ago |
|
sy
|
d72a3bd31f
|
考勤-加班结果最终时长转计薪时长功能
|
5 months ago |
|
sy
|
6b0f1e6e6c
|
考勤-请假、出差流程，全局唯一性规则校验
|
6 months ago |
|
sy
|
5680590a31
|
考勤，考勤日报视图刷新功能修改，用助记码替代名称；日历排班列表查询条件增加状态字段
|
6 months ago |
|
sy
|
7c2ba0f269
|
考勤-考勤汇总，新增考勤汇总时累分数值转换优化
|
6 months ago |
|
sy
|
94688d0d9c
|
Merge remote-tracking branch 'origin/main'
|
6 months ago |
|
sy
|
4726d6a479
|
考勤-出差、补打卡流程，流程强制退回、删除相关数据重置逻辑
|
6 months ago |
|
sy
|
5f9fcd5a1d
|
考勤-请假流程，明细生成匹配假期优先使用级联逻辑
|
6 months ago |
|
liuliang
|
1fe80a06fd
|
新增假期发放根据离职日期入职日期折算功能、修改循环按期发放折算bug、修改一次性发放假期余额逻辑、优化查询班次逻辑
|
6 months ago |
|
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
|
6 months ago |
|
sy
|
0e37250a50
|
考勤
|
6 months ago |
|
sy
|
c33cec2a67
|
考勤，加班计划流程明细数据生成逻辑改造，区分休息、就餐班段
|
6 months ago |
|
liuliang
|
97564618d7
|
扣除加班休息时长
|
6 months ago |
|
liuliang
|
7180c4de28
|
休息班段请假合并
|
6 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 |
