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 |
|
sy
|
dce81e8d7e
|
考勤，考勤日报相关视图刷新功能中查询逻辑增加班次字段
|
10 months ago |
|
sy
|
3b08141f04
|
考勤，考勤日报相关视图刷新功能中生成sql分组逻辑增加班次字段
|
10 months ago |
|
sy
|
de1fd1bed3
|
考勤，考勤日报相关视图刷新功能中增加班次字段
|
10 months ago |
|
liuliang
|
63ae8376b5
|
优化加班
|
10 months ago |
|
liuliang
|
cea2e95b65
|
liuliang
|
10 months ago |
|
sy
|
7ffed5f24e
|
Merge remote-tracking branch 'origin/main'
|
10 months ago |
|
sy
|
4cff17a919
|
考勤，出勤津贴数据生成功能中增加“加班时长计入核算量”字段相关逻辑
|
10 months ago |
|
liuliang
|
280a4d8a11
|
调整流程
|
10 months ago |
|
liuliang
|
0e6a0bcd65
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
10 months ago |
|
liuliang
|
927494015a
|
合并班段
|
10 months ago |
|
sy
|
26db439bb0
|
考勤，出勤结果明细页面，打卡数据增加补打卡类型名称返回
|
10 months ago |
|
sy
|
cf6304c4e4
|
考勤，出勤结果明细页面，打卡数据增加补打卡字段流程id、数据来源等数据
|
10 months ago |
|
liuliang
|
dfc437f4d1
|
优化弹性班次代码
|
10 months ago |
|
liuliang
|
083f005268
|
修改弹性班次以及候选班次数据混乱的问题
|
10 months ago |
|
liuliang
|
51299db4b0
|
调整日期类型
|
11 months ago |
|
liuliang
|
e57b7c6398
|
修改卡点，出勤结果编辑后增加出勤结果
|
11 months ago |
|
sy
|
50ae22e21f
|
考勤，日历排班结果列表导入预览接口
|
11 months ago |
|
sy
|
b2904e1aad
|
考勤，日历排班结果列表导出接口逻辑优化,部门、分部字段增加多语言格式表述解析
|
11 months ago |
|
sy
|
de9e941ab9
|
考勤，日历排班结果列表导出接口逻辑优化
|
11 months ago |
|
liuliang
|
4631b03cb6
|
调整卡点
|
11 months ago |
|
sy
|
2d6b992cda
|
考勤，日历排班结果列表导出导入接口
|
11 months ago |
|
liuliang
|
5d44b211ea
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
11 months ago |
|
liuliang
|
85754e8feb
|
日历排班
|
11 months ago |
|
sy
|
30e606f250
|
考勤，出勤津贴数据生成功能逻辑优化，目标人员或班次出现空时，不进行旧数据删除
|
11 months ago |
|
liuliang
|
ad5de70136
|
liuliang
|
11 months ago |
|
liuliang
|
28061f710c
|
liuliang
|
11 months ago |
|
sy
|
2daf6e009a
|
Merge remote-tracking branch 'origin/main'
|
11 months ago |
|
sy
|
d0db86fbf3
|
考勤，考勤日报相关视图刷新功能中增加津贴数据表、补打卡记录表数据字段
|
11 months ago |
|
liuliang
|
7a8ed429ba
|
增加日期类型公共方法
|
11 months ago |
|
liuliang
|
b2755a47b7
|
liuliang
|
11 months ago |
|
liuliang
|
d1a3489f74
|
日历排班分页，手工和已确认数据不分析，批量分析接口失败
|
11 months ago |
|
liuliang
|
b17eb586c4
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
11 months ago |
|
liuliang
|
e21553e125
|
liuliang
|
11 months ago |
|
sy
|
77d1bb3bb6
|
考勤，企业日历初始化功能接口增加返回值
|
11 months ago |
|
liuliang
|
35a458823d
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
11 months ago |
|
liuliang
|
71bf4f4401
|
liuliang
|
11 months ago |
|
sy
|
faeff4269a
|
考勤，请假流程提交节点校验action增加请假次数不足的判断
|
11 months ago |
|
liuliang
|
507d909a8f
|
liuliang
|
11 months ago |
|
liuliang
|
a25ac981f1
|
liuliang
|
11 months ago |
|
sy
|
785ee44a92
|
Merge remote-tracking branch 'origin/main'
|
11 months ago |
|
sy
|
fede14ba42
|
考勤，考勤汇总报表导出功能问题修复、考勤汇总报表查询功能增加分权逻辑
|
11 months ago |
|
liuliang
|
dc20a05e84
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
11 months ago |
|
liuliang
|
959163ad69
|
请假流程过滤节假日，修复请假流程提交校验假期余额逻辑
|
11 months ago |
pzy2
|
277cf33c93
|
feat: 新增聚才林打卡接口
|
11 months ago |
|
sy
|
23459242c7
|
考勤，考勤日报相关视图刷新功能中字段名截取逻辑优化
|
11 months ago |
|
liuliang
|
124668aa4f
|
liuliang
|
11 months ago |
|
sy
|
3651b57b91
|
Merge remote-tracking branch 'origin/main'
|
11 months ago |
|
sy
|
118dfa9a65
|
考勤，出勤津贴数据生成功能中班次班段数据处理逻辑变更，直接从班次明细表中获取
|
11 months ago |
|
liuliang
|
f08667f81a
|
liuliang
|
11 months ago |
|
liuliang
|
ab3c899b07
|
liuliang
|
11 months ago |
|
sy
|
d759111b82
|
考勤，出勤汇总导出、考勤日报相关视图刷新功能
|
11 months ago |
|
liuliang
|
73274faecd
|
候选班组逻辑、休息班次工作时段转加班
|
11 months ago |
|
liuliang
|
eb123f6123
|
liuliang
|
11 months ago |
|
sy
|
29d9fd522f
|
Merge remote-tracking branch 'origin/main'
|
11 months ago |
|
sy
|
127bb546a4
|
考勤，请假流程校验action增加请假时长不足最小时长要求的判断
|
11 months ago |
|
liuliang
|
a8ef695f8e
|
liuliang
|
11 months ago |
|
liuliang
|
cecfd7a350
|
liuliang
|
11 months ago |
|
sy
|
715701613b
|
考勤，打卡数据匹配候选班组中某班次逻辑中问题修复实际打卡时间点取值逻辑
|
11 months ago |
|
liuliang
|
0067e99a0c
|
liuliang
|
11 months ago |
|
sy
|
b4512cda29
|
考勤，出勤津贴数据生成功能逻辑优化，旧的津贴数据删除逻辑修复，津贴数据状态赋值逻辑添加
|
11 months ago |
|
sy
|
cd0cdad702
|
考勤，打卡数据匹配候选班组中某班次信息方法返回增加班次数据
|
11 months ago |
|
sy
|
c2e2bd4c64
|
考勤，打卡数据匹配候选班组中某班次信息方法
|
11 months ago |
|
liuliang
|
0f5956f4fb
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
11 months ago |
|
liuliang
|
0126f71ab4
|
liuliang
|
11 months ago |
|
sy
|
57f2bf83a7
|
Merge remote-tracking branch 'origin/main'
|
11 months ago |
|
sy
|
15ae02339d
|
考勤，出勤津贴数据生成功能中目标人员获取逻辑变更，出现通用津贴数据时，适用范围默认为全员
|
11 months ago |
|
liuliang
|
81d913eeb5
|
liuliang
|
12 months ago |
|
liuliang
|
35e024cf61
|
liuliang
|
12 months ago |
|
liuliang
|
b84e9921f9
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
12 months ago |
|
liuliang
|
64599fa0ab
|
将卡点换成实体类
|
12 months ago |
|
sy
|
535f8e995a
|
Merge remote-tracking branch 'origin/main'
|
12 months ago |
|
sy
|
b0b6748ae6
|
考勤，汇总数据生成逻辑中添加汇总主表中汇总状态变更过程
|
12 months ago |
|
liuliang
|
8722a107dc
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
12 months ago |
|
liuliang
|
5e7b52803c
|
liuliang
|
12 months ago |
|
sy
|
d48b132e9b
|
考勤，请假流程校验action额度不足时返回提示修改
|
12 months ago |
|
liuliang
|
7748a45ccb
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
12 months ago |
|
liuliang
|
c45653f6e0
|
liuliang
|
12 months ago |
|
sy
|
58df1145d8
|
考勤，请假流程节点action类逻辑中有关校验假期额度的假期类型筛选优化
|
12 months ago |
|
sy
|
517bbeaddb
|
考勤，汇总数据生成问题修复
|
12 months ago |
|
liuliang
|
1222951520
|
规律排班遇到休息班次为休息，考勤分析没有排班遇到休息日时不记异常
|
12 months ago |
|
liuliang
|
ad494d954b
|
liuliang
|
12 months ago |
|
sy
|
8e2c9ba0f8
|
考勤，请假流程节点action类逻辑优化
|
12 months ago |
|
sy
|
cf271ea653
|
Merge remote-tracking branch 'origin/main'
|
12 months ago |
|
sy
|
3c82054b63
|
考勤，请假流程节点action类逻辑修改，增加需要校验假期额度的假期类型筛选
|
12 months ago |
|
liuliang
|
b206d01465
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
12 months ago |
|
liuliang
|
1a43712cda
|
liuliang
|
12 months ago |
|
sy
|
20d8957f59
|
Merge remote-tracking branch 'origin/main'
|
12 months ago |
|
sy
|
a054cfc2a4
|
考勤，企业日历初始化功能需求变更，适配单双休逻辑
|
12 months ago |
|
liuliang
|
a293591f4a
|
liuliang
|
12 months ago |
|
sy
|
4208d755ad
|
考勤，出勤津贴数据生成功能变更，适配出勤结果中进出时间格式变化
|
1 year ago |
|
sy
|
a270e20e92
|
考勤，企业日历初始化功能接口
|
1 year ago |
|
sy
|
531702b96f
|
Merge remote-tracking branch 'origin/main'
|
1 year ago |
|
sy
|
9348686aca
|
考勤，出勤汇总功能优化
|
1 year ago |
|
liuliang
|
5c3374c2a1
|
liuliang
|
1 year ago |
|
liuliang
|
349b327af6
|
liuliang
|
1 year ago |
|
liuliang
|
c52d25d110
|
liuliang
|
1 year ago |
|
sy
|
3298c0166b
|
Merge remote-tracking branch 'origin/main'
|
1 year ago |
|
sy
|
d325c96872
|
考勤，出勤津贴数据生成功能优化
|
1 year ago |
|
liuliang
|
39c0a2cb94
|
11
|
1 year ago |
|
liuliang
|
8b602159d9
|
liuliang
|
1 year ago |
|
liuliang
|
46a4de5964
|
liuliang
|
1 year ago |
|
sy
|
59f176cd60
|
Merge remote-tracking branch 'origin/main'
|
1 year ago |
|
sy
|
4f476406c1
|
考勤，出勤津贴数据生成功能中目标津贴项目ids获取逻辑调整，增加通用津贴项目
|
1 year ago |
|
liuliang
|
bee2e44258
|
liuliang
|
1 year ago |
|
liuliang
|
94b053c848
|
liuliang
|
1 year ago |
|
sy
|
eb93dd383c
|
考勤，出勤津贴数据生成功能中人员范围ids获取逻辑优化
|
1 year ago |
|
sy
|
0110b41c3f
|
考勤，出勤津贴数据生成功能中人员范围ids获取逻辑增加日志记录
|
1 year ago |
|
sy
|
50bbacf3e8
|
Merge remote-tracking branch 'origin/main'
|
1 year ago |
|
sy
|
892d22415e
|
考勤，出勤津贴数据生成逻辑优化
|
1 year ago |
|
liuliang
|
92830297ef
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
1 year ago |
|
liuliang
|
e2663afe3d
|
liuliang
|
1 year ago |
|
sy
|
5b933ca3bf
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# src/com/engine/common/util/CommonUtil.java
|
1 year ago |
|
sy
|
625419ed8d
|
考勤，出勤津贴数据生成功能接口
|
1 year ago |
|
liuliang
|
a382660455
|
liuliang
|
1 year ago |
|
liuliang
|
eb8e91270e
|
liuliang
|
1 year ago |
|
sy
|
0183afe5d4
|
考勤，出勤汇总报表查询接口逻辑优化
|
1 year ago |
|
sy
|
b851062c1c
|
考勤，出勤汇总数据新增接口添加日志记录
|
1 year ago |
|
sy
|
edc71bd6ee
|
考勤，出勤汇总报表查询接口逻辑优化
|
1 year ago |
|
sy
|
70c48dad5a
|
Merge remote-tracking branch 'origin/main'
|
1 year ago |
|
sy
|
72944a523f
|
考勤，出勤汇总报表相关接口,增加日志记录
|
1 year ago |
|
liuliang
|
5315603594
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
1 year ago |
|
liuliang
|
e616f7f968
|
liuliang
|
1 year ago |
|
sy
|
783da0574b
|
考勤，出勤汇总报表相关接口
|
1 year ago |
