 liuliang
|
73274faecd
|
候选班组逻辑、休息班次工作时段转加班
|
1 year ago |
|
liuliang
|
eb123f6123
|
liuliang
|
1 year ago |
sy
|
29d9fd522f
|
Merge remote-tracking branch 'origin/main'
|
1 year ago |
|
sy
|
127bb546a4
|
考勤，请假流程校验action增加请假时长不足最小时长要求的判断
|
1 year ago |
|
liuliang
|
a8ef695f8e
|
liuliang
|
1 year ago |
|
liuliang
|
cecfd7a350
|
liuliang
|
1 year ago |
|
sy
|
715701613b
|
考勤，打卡数据匹配候选班组中某班次逻辑中问题修复实际打卡时间点取值逻辑
|
1 year ago |
|
liuliang
|
0067e99a0c
|
liuliang
|
1 year ago |
|
sy
|
b4512cda29
|
考勤，出勤津贴数据生成功能逻辑优化，旧的津贴数据删除逻辑修复，津贴数据状态赋值逻辑添加
|
1 year ago |
|
sy
|
cd0cdad702
|
考勤，打卡数据匹配候选班组中某班次信息方法返回增加班次数据
|
1 year ago |
|
sy
|
c2e2bd4c64
|
考勤，打卡数据匹配候选班组中某班次信息方法
|
1 year ago |
|
liuliang
|
0f5956f4fb
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
1 year ago |
|
liuliang
|
0126f71ab4
|
liuliang
|
1 year ago |
|
sy
|
57f2bf83a7
|
Merge remote-tracking branch 'origin/main'
|
1 year ago |
|
sy
|
15ae02339d
|
考勤，出勤津贴数据生成功能中目标人员获取逻辑变更，出现通用津贴数据时，适用范围默认为全员
|
1 year ago |
|
liuliang
|
81d913eeb5
|
liuliang
|
1 year ago |
|
liuliang
|
35e024cf61
|
liuliang
|
1 year ago |
|
liuliang
|
b84e9921f9
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
1 year ago |
|
liuliang
|
64599fa0ab
|
将卡点换成实体类
|
1 year ago |
|
sy
|
535f8e995a
|
Merge remote-tracking branch 'origin/main'
|
1 year ago |
|
sy
|
b0b6748ae6
|
考勤，汇总数据生成逻辑中添加汇总主表中汇总状态变更过程
|
1 year ago |
|
liuliang
|
8722a107dc
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
1 year ago |
|
liuliang
|
5e7b52803c
|
liuliang
|
1 year ago |
|
sy
|
d48b132e9b
|
考勤，请假流程校验action额度不足时返回提示修改
|
1 year ago |
|
liuliang
|
7748a45ccb
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
1 year ago |
|
liuliang
|
c45653f6e0
|
liuliang
|
1 year ago |
|
sy
|
58df1145d8
|
考勤，请假流程节点action类逻辑中有关校验假期额度的假期类型筛选优化
|
1 year ago |
|
sy
|
517bbeaddb
|
考勤，汇总数据生成问题修复
|
1 year ago |
|
liuliang
|
1222951520
|
规律排班遇到休息班次为休息，考勤分析没有排班遇到休息日时不记异常
|
1 year ago |
|
liuliang
|
ad494d954b
|
liuliang
|
1 year ago |
|
sy
|
8e2c9ba0f8
|
考勤，请假流程节点action类逻辑优化
|
1 year ago |
|
sy
|
cf271ea653
|
Merge remote-tracking branch 'origin/main'
|
1 year ago |
|
sy
|
3c82054b63
|
考勤，请假流程节点action类逻辑修改，增加需要校验假期额度的假期类型筛选
|
1 year ago |
|
liuliang
|
b206d01465
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
1 year ago |
|
liuliang
|
1a43712cda
|
liuliang
|
1 year ago |
|
sy
|
20d8957f59
|
Merge remote-tracking branch 'origin/main'
|
1 year ago |
|
sy
|
a054cfc2a4
|
考勤，企业日历初始化功能需求变更，适配单双休逻辑
|
1 year ago |
|
liuliang
|
a293591f4a
|
liuliang
|
1 year 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
|
fbcdecdf52
|
考勤，出勤汇总报表中考勤项目浏览按钮实现逻辑优化
|
1 year ago |
|
sy
|
199c942719
|
考勤，出勤汇总报表中考勤项目浏览按钮类新增
|
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 |
|
sy
|
0926a17f3d
|
Merge remote-tracking branch 'origin/main'
|
1 year ago |
|
sy
|
045ebabd63
|
考勤，销差action优化
|
1 year ago |
|
liuliang
|
3640bf24e4
|
liuliang
|
1 year ago |
|
liuliang
|
7127aae951
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
1 year ago |
|
liuliang
|
d11421f2d6
|
liuliang
|
1 year ago |
|
sy
|
8a9a0d8af3
|
考勤，销差action优化
|
1 year ago |
|
sy
|
0dba768533
|
考勤，销差action添加日志
|
1 year ago |
|
sy
|
84c86763d9
|
Merge remote-tracking branch 'origin/main'
|
1 year ago |
|
sy
|
84a9b09555
|
考勤，销差action添加日志
|
1 year ago |
|
liuliang
|
39bac1ccfa
|
liuliang
|
1 year ago |
|
sy
|
54f04ea51b
|
考勤，出差申请明细列表查询sql优化
|
1 year ago |
|
sy
|
ae3baba0fb
|
考勤，出差申请明细列表查询接口结果返回优化
|
1 year ago |
|
sy
|
4ea06e68ca
|
考勤，出差申请明细列表查询接口返回优化
|
1 year ago |
|
sy
|
af554e068d
|
考勤，出差申请明细列表查询接口
|
1 year ago |
|
liuliang
|
65366e6dfa
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
1 year ago |
|
liuliang
|
48b4f660d1
|
liuliang
|
1 year ago |
|
sy
|
c88249211a
|
考勤-出差撤销接口
|
1 year ago |
|
liuliang
|
bf3b5a7ab9
|
liuliang
|
1 year ago |
|
liuliang
|
135112a840
|
liuliang
|
1 year ago |
|
liuliang
|
8251489d62
|
liuliang
|
1 year ago |
|
liuliang
|
0401d6c890
|
liuliang
|
1 year ago |
|
liuliang
|
68b3e5579c
|
liuliang
|
1 year ago |
|
liuliang
|
2db8318e41
|
liuliang
|
1 year ago |
|
liuliang
|
99d1eaa027
|
liuliang
|
1 year ago |
 seaon
|
fa21212925
|
Changes
|
1 year ago |
|
seaon
|
fbe93e4a10
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
1 year ago |
|
liuliang
|
481c1d2ceb
|
liuliang
|
1 year ago |
|
seaon
|
b89d54c524
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
Conflicts:
out/artifacts/hrm_attendance/hrm-attendance.jar
|
1 year ago |
|
liuliang
|
8933227ebb
|
Merge branch 'main' of http://221.226.25.34:3000/liuliang/hrm-attendance
|
1 year ago |
|
liuliang
|
953a7ed522
|
liuliang
|
1 year ago |
|
seaon
|
1c9d819c86
|
Changes
|
1 year ago |
|
seaon
|
6ffbde62f3
|
Changes
|
1 year ago |
|
seaon
|
5225c0c68c
|
Changes
|
1 year ago |
|
seaon
|
177c562220
|
Changes
|
1 year ago |
|
liuliang
|
b410a8866c
|
liulian
|
1 year ago |
|
liuliang
|
5975adb309
|
liuliangh
|
1 year ago |
|
liuliang
|
1cc35255a3
|
liuliang
|
1 year ago |
|
liuliang
|
c08dac5015
|
liuliang
|
1 year ago |
|
liuliang
|
a753d6ba22
|
liuliang
|
2 years ago |
|
liuliang
|
6e8670b810
|
liuliang
|
2 years ago |
|
liuliang
|
fae56112e3
|
liuliang
|
2 years ago |
|
liuliang
|
d850d60447
|
liuliang
|
2 years ago |
|
liuliang
|
cf734e7dc3
|
liuliang
|
2 years ago |
|
liuliang
|
c846119a7b
|
liuliang
|
2 years ago |
|
liuliang
|
a6cf2b53b0
|
liuliang
|
2 years ago |
|
liuliang
|
9338feaea6
|
liuliang
|
2 years ago |
|
liuliang
|
54101fe06e
|
liuliang
|
2 years ago |
|
liuliang
|
00747aed0c
|
liuliang
|
2 years ago |
|
liuliang
|
b56b72e12b
|
liuliang
|
2 years ago |
|
liuliang
|
9c728cd1b4
|
liuliang
|
2 years ago |
|
liuliang
|
adf1d6ce86
|
liuliang
|
2 years ago |
|
liuliang
|
860a825441
|
liuliang
|
2 years ago |
|
liuliang
|
dec7a29dc4
|
liuliang
|
2 years ago |
|
liuliang
|
33341430f6
|
考勤分析
|
2 years ago |
|
liuliang
|
0290e1f04f
|
liuliang
|
2 years ago |
|
liuliang
|
2f11bc7cbb
|
liuliang
|
2 years ago |
|
liuliang
|
cbf7df6cd2
|
排班结果查询
|
2 years ago |
|
liuliang
|
f30da38662
|
规律排班
|
2 years ago |
|
liuliang
|
bec9050a5f
|
liuliang
|
2 years ago |
|
liuliang
|
58fa293e44
|
liuliang
|
2 years ago |
|
liuliang
|
767a5759ca
|
工具类
|
2 years ago |
