 fl
|
b37c6af313
|
请假数据同步添加字段，更新同步流程
|
2025-02-20 16:11:11 +08:00 |
|
fl
|
6ccabe57b4
|
历史推送简化修改
|
2025-02-20 09:26:04 +08:00 |
 cwchen
|
266d36561e
|
考勤修改 审核流程修改
|
2025-02-20 09:13:36 +08:00 |
|
cwchen
|
d9edbae9ff
|
考勤修改 审核流程修改
|
2025-02-19 19:32:31 +08:00 |
|
cwchen
|
de0c0e02b8
|
文件上传修改
|
2025-02-19 19:01:59 +08:00 |
|
cwchen
|
57e40f546f
|
考勤修改
|
2025-02-19 17:26:41 +08:00 |
|
cwchen
|
eedb654f32
|
考勤修改
|
2025-02-19 16:48:01 +08:00 |
|
cwchen
|
45593bceb0
|
文件上传
|
2025-02-19 14:00:31 +08:00 |
|
fl
|
2c24ba58a8
|
考勤流程定时器规则设置
历史考勤接口调试
|
2025-02-19 11:29:56 +08:00 |
|
fl
|
df41b0f7d9
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# bonus-modules/bonus-system/src/main/java/com/bonus/system/att/entity/AttGroupBean.java
|
2025-02-18 21:02:23 +08:00 |
|
fl
|
01208754a4
|
日月报表生成
|
2025-02-18 21:01:41 +08:00 |
|
cwchen
|
96194bd879
|
月报表、月异常报表导出修改
|
2025-02-18 20:22:03 +08:00 |
|
cwchen
|
d5757a7e05
|
当天新增人员-生成当天考勤模板数据
|
2025-02-18 14:04:52 +08:00 |
|
fl
|
64dcc34d46
|
考勤请假数据重构
|
2025-02-18 11:11:38 +08:00 |
|
fl
|
37bedd187d
|
考勤计算重构
|
2025-02-18 10:56:55 +08:00 |
|
cwchen
|
bf1e35a4d8
|
人员信息删除-同步删除考勤信息
|
2025-02-18 10:46:42 +08:00 |
|
cwchen
|
d9a74f6cd1
|
考勤规则-添加是否有法定节假日
|
2025-02-18 10:27:25 +08:00 |
|
cwchen
|
80f13e68c7
|
考勤规则-人员树修改
|
2025-02-18 09:30:42 +08:00 |
 lSun
|
a0713ca6d3
|
出差报备
Signed-off-by: lSun <15893999301@qq.com>
|
2025-02-14 18:11:34 +08:00 |
|
fl
|
830e77d4bf
|
修改考勤规则记录所在时间
|
2025-02-13 16:49:21 +08:00 |
|
cwchen
|
bd059632ce
|
休假报备、出差报备 删除和修改添加限制
|
2025-02-13 10:34:26 +08:00 |
|
cwchen
|
23d865fe9f
|
休假报备、出差报备 删除和修改添加限制
|
2025-02-12 16:00:14 +08:00 |
|
cwchen
|
52b6da1b53
|
休假报备、出差报备 删除和修改添加限制
|
2025-02-12 15:18:11 +08:00 |
|
fl
|
960d9cd6f1
|
月计划天数按当月最后所在的组织决定
|
2025-02-12 10:59:17 +08:00 |
|
fl
|
de8a9f61aa
|
月计划与月计划异常导出添加头部条件
|
2025-02-12 09:56:53 +08:00 |
|
fl
|
9117c69c1b
|
月报表导出问题修改
人员考勤组时间生成修改
|
2025-02-12 09:37:48 +08:00 |
|
fl
|
9bf8a8b7c8
|
月报表生成先删除在生成
导出考勤状态问题修改
|
2025-02-12 09:36:00 +08:00 |
|
cwchen
|
4ffee47816
|
八大员缺员兼职查询接口修改、一键审批
|
2025-02-11 17:47:18 +08:00 |
|
cwchen
|
dfa1d87787
|
八大员缺员兼职查询接口修改、一键审批
|
2025-02-11 15:01:39 +08:00 |
|
cwchen
|
aaae74c9b6
|
八大员缺员兼职查询接口修改
|
2025-02-11 12:34:37 +08:00 |
|
cwchen
|
9f582413c2
|
八大员缺员兼职查询
|
2025-02-11 11:13:48 +08:00 |
|
lSun
|
f02d86e801
|
模块数据隔离，bug修改
Signed-off-by: lSun <15893999301@qq.com>
|
2025-02-10 09:58:38 +08:00 |
|
fl
|
c9e4a817b4
|
导出问题修改
组织问题修改
|
2025-02-06 18:04:41 +08:00 |
 史宗金
|
8eb2c081c0
|
修改假期，节假日定时器
|
2025-01-24 09:17:10 +08:00 |
|
史宗金
|
3a049d808e
|
修改假期，节假日定时器
|
2025-01-23 19:05:40 +08:00 |
|
史宗金
|
619f89d0bf
|
Merge remote-tracking branch 'origin/main'
|
2025-01-23 19:05:00 +08:00 |
|
fl
|
358707fc28
|
考勤规则问题修改
|
2025-01-23 19:03:25 +08:00 |
|
史宗金
|
f49269d24c
|
Merge remote-tracking branch 'origin/main'
|
2025-01-23 18:22:45 +08:00 |
|
fl
|
d71f4140ce
|
备注添加
|
2025-01-23 18:22:02 +08:00 |
|
史宗金
|
5c504b6208
|
Merge remote-tracking branch 'origin/main'
|
2025-01-23 17:01:16 +08:00 |
|
fl
|
2d868cd5c0
|
同步考勤数据问题
|
2025-01-23 16:59:16 +08:00 |
|
史宗金
|
4e97676ed8
|
Merge remote-tracking branch 'origin/main'
|
2025-01-23 16:59:05 +08:00 |
|
lSun
|
60827c41da
|
模块数据隔离，bug修改
Signed-off-by: lSun <15893999301@qq.com>
|
2025-01-23 16:47:30 +08:00 |
|
史宗金
|
d157580622
|
Merge remote-tracking branch 'origin/main'
|
2025-01-23 13:01:46 +08:00 |
|
fl
|
57539edda8
|
导出修改
组织删除修改
考勤相关历史组织查询修改
|
2025-01-22 16:32:25 +08:00 |
|
史宗金
|
37416e2539
|
Merge remote-tracking branch 'origin/main'
|
2025-01-22 13:08:43 +08:00 |
|
fl
|
ee8b14b27c
|
人员请假等根据公司或项目部区分是否去除周六日
|
2025-01-22 09:49:23 +08:00 |
|
史宗金
|
b6e499c4d0
|
修改假期，节假日定时器
|
2025-01-22 09:08:03 +08:00 |
|
lSun
|
61935d5704
|
模块数据隔离，bug修改
Signed-off-by: lSun <15893999301@qq.com>
|
2025-01-21 19:45:51 +08:00 |
|
fl
|
a6cd511905
|
考勤添加时间
|
2025-01-20 13:41:32 +08:00 |