aikai
|
9fd8c803ff
|
修改定时任务bug
|
2024-06-14 17:10:06 +08:00 |
|
aikai
|
6557d6b502
|
更换获取每年节假日路径
|
2024-06-14 12:05:44 +08:00 |
|
aikai
|
43287e22e5
|
考勤
|
2024-06-13 15:29:44 +08:00 |
|
aikai
|
627334e51e
|
考勤定时增量调整
|
2024-06-13 10:41:14 +08:00 |
|
aikai
|
bbc8e4c6a6
|
Merge branch 'dev' of http://47.97.8.94:19527/yj/zn-cloud into dev
|
2024-06-12 20:13:19 +08:00 |
|
aikai
|
272875ea64
|
获取考勤规则
|
2024-06-12 20:13:10 +08:00 |
|
furongxin
|
6de8883a50
|
Merge branch 'dev' into frx
|
2024-06-12 15:24:24 +08:00 |
|
furongxin
|
5dc3915a33
|
修改 日志可以查看用户，可以查询出不可用状态的用户问题
|
2024-06-12 15:20:08 +08:00 |
|
furongxin
|
912a30fabb
|
员工录入功能修改
|
2024-06-12 15:19:36 +08:00 |
|
aikai
|
18ab3c1693
|
调整班次更新的机制
|
2024-06-12 10:07:52 +08:00 |
|
aikai
|
7eee7f1a81
|
计算考勤调整
|
2024-06-12 09:57:34 +08:00 |
|
aikai
|
e23d46b585
|
获取用户考勤组调整/获取打卡页面调整
|
2024-06-11 15:30:12 +08:00 |
|
aikai
|
cecbe3fc74
|
固定班次/排版班次编辑顺序 立即更新
|
2024-06-11 14:31:48 +08:00 |
|
aikai
|
83888cd77f
|
Merge branch 'dev' of http://47.97.8.94:19527/yj/zn-cloud into dev
|
2024-06-11 11:54:36 +08:00 |
|
aikai
|
4923001ead
|
固定班次/排版班次编辑顺序 立即更新
|
2024-06-11 11:54:30 +08:00 |
|
furongxin
|
2ed4de174b
|
监控摄像头模块
|
2024-06-09 18:33:10 +08:00 |
|
furongxin
|
a1a3d94f71
|
Merge branch 'dev' into frx
|
2024-06-07 16:57:27 +08:00 |
|
furongxin
|
1a6b8d5930
|
工厂员工录入 功能模块
|
2024-06-07 15:17:40 +08:00 |
|
aikai
|
965215996a
|
解决依赖循环问题/新增调整人员立即生效
|
2024-06-07 10:30:55 +08:00 |
|
furongxin
|
ed8ed8c37b
|
出入库修改
工厂员工录入 模块
|
2024-06-06 22:30:57 +08:00 |
|
aikai
|
e6292c3ae2
|
Merge branch 'dev' of http://47.97.8.94:19527/yj/zn-cloud into dev
|
2024-06-05 22:33:53 +08:00 |
|
aikai
|
9923e6d98b
|
解决依赖循环问题
|
2024-06-05 22:33:46 +08:00 |
|
furongxin
|
3738ad960b
|
Merge branch 'dev' into frx
|
2024-06-05 21:42:50 +08:00 |
|
furongxin
|
f8196e3a44
|
出入库数据修改， 追加出入库导入功能
|
2024-06-05 21:31:16 +08:00 |
|
furongxin
|
ddd22df271
|
追加Feign 部门API 查询部门负责人借口
|
2024-06-05 21:29:20 +08:00 |
|
aikai
|
f477e9e0e5
|
更新考勤组班次/更换考勤班次立即生效
|
2024-06-05 21:29:14 +08:00 |
|
aikai
|
76c23e976b
|
考勤组还有人员不允许删除 - 考勤组人员筛选
|
2024-06-05 17:39:42 +08:00 |
|
aikai
|
574a79eac5
|
Merge branch 'dev' of http://47.97.8.94:19527/yj/zn-cloud into dev
|
2024-06-05 17:20:40 +08:00 |
|
aikai
|
c74b57e29e
|
移动考勤app模块至admin模块/为了调整用户登陆问题/考勤定时任务中更新redis缓存
|
2024-06-05 17:20:33 +08:00 |
|
furongxin
|
1a73d70965
|
Merge branch 'dev' into frx
|
2024-06-05 09:29:06 +08:00 |
|
furongxin
|
afa1689cb6
|
考勤设备模块
|
2024-06-05 09:28:30 +08:00 |
|
furongxin
|
021a486541
|
考勤设备 Feign远程调用API
|
2024-06-05 09:25:51 +08:00 |
|
aikai
|
e1bea33639
|
考勤用户过滤/考勤定时任务
|
2024-06-04 16:29:06 +08:00 |
|
aikai
|
c501dea1f4
|
设备打卡调整
|
2024-06-04 14:02:03 +08:00 |
|
furongxin
|
c3e65b3f4e
|
Merge branch 'main' into frx
|
2024-06-03 19:03:35 +08:00 |
|
furongxin
|
96341c1978
|
修改 日志可查看用户， 排除管理员角色
|
2024-06-03 19:02:48 +08:00 |
|
aikai
|
2f821a76b1
|
平均工时调整
|
2024-05-30 20:55:32 +08:00 |
|
aikai
|
c38622562d
|
获取当前登陆用户所在考勤组并且是否有管理员权限
|
2024-05-30 18:52:22 +08:00 |
|
aikai
|
628682bb8d
|
团队统计
|
2024-05-30 18:08:40 +08:00 |
|
aikai
|
466bcae711
|
Merge branch 'dev' of http://47.97.8.94:19527/yj/zn-cloud into dev
|
2024-05-30 17:50:36 +08:00 |
|
aikai
|
a06aa2fda6
|
团队统计
|
2024-05-30 17:50:28 +08:00 |
|
furongxin
|
d96580d6b1
|
考勤设备管理
|
2024-05-30 09:44:52 +08:00 |
|
furongxin
|
e48e3ba95c
|
Merge branch 'main' into frx
|
2024-05-29 18:34:31 +08:00 |
|
|
|
f7b7c3fa2d
|
考勤仪设备websocket
|
2024-05-29 17:48:55 +08:00 |
|
|
|
25ea561dc8
|
考勤仪设备websocket
|
2024-05-29 17:46:59 +08:00 |
|
furongxin
|
85d6235465
|
Merge branch 'dev' into frx
|
2024-05-29 15:22:32 +08:00 |
|
aikai
|
e1adac3c89
|
调整按天统计
|
2024-05-28 11:51:42 +08:00 |
|
aikai
|
b2e2c07d2e
|
调整按天统计
|
2024-05-28 11:35:37 +08:00 |
|
furongxin
|
9c4d7b8a40
|
Merge branch 'dev' into frx
|
2024-05-28 10:14:32 +08:00 |
|
aikai
|
3798cb6a63
|
考勤按天/按周统计
|
2024-05-27 20:41:55 +08:00 |
|
