furongxin
|
0e8b4696f3
|
出入库数据修改， 追加出入库导入功能
|
2024-06-05 21:31:02 +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
|
0c7e9dc026
|
考勤设备 websocket命令解析
|
2024-06-05 09:26:37 +08:00 |
|
furongxin
|
021a486541
|
考勤设备 Feign远程调用API
|
2024-06-05 09:25:51 +08:00 |
|
furongxin
|
c4ea4ae284
|
websocket 考勤设备回调信息处理
|
2024-06-05 09:24:08 +08:00 |
|
furongxin
|
cf97bddeee
|
修改 模拟用户，租户ID获取方式
|
2024-06-05 09:22:34 +08:00 |
|
aikai
|
e1bea33639
|
考勤用户过滤/考勤定时任务
|
2024-06-04 16:29:06 +08:00 |
|
aikai
|
c501dea1f4
|
设备打卡调整
|
2024-06-04 14:02:03 +08:00 |
|
furongxin
|
e8b3865643
|
修改数据大屏, 查看不到雨化田
|
2024-06-03 19:50:23 +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 |
|
furongxin
|
7f592dcdf4
|
新增 小程序查询 我的任务 未完成的数量
|
2024-05-31 10:40:01 +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
|
cd8bcd203b
|
Merge branch 'main' of http://47.97.8.94:19527/yj/zn-cloud into dev
|
2024-05-30 17:53:22 +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
|
860b2a377c
|
Merge branch 'main' into frx
|
2024-05-30 10:17:41 +08:00 |
|
|
|
4ac43e0b57
|
考勤仪设备websocket
|
2024-05-30 10:17:08 +08:00 |
|
furongxin
|
5764799990
|
增加 删除图片api
|
2024-05-30 09:45:45 +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
|
01670063ae
|
工厂出入库数据录入， 入库、出库分录入 修改
|
2024-05-29 16:13:56 +08:00 |
|
furongxin
|
85d6235465
|
Merge branch 'dev' into frx
|
2024-05-29 15:22:32 +08:00 |
|
furongxin
|
9c98b2e6c9
|
工厂出入库数据录入， 入库、出库分录入 修改
|
2024-05-29 15:21:38 +08:00 |
|
aikai
|
e1adac3c89
|
调整按天统计
|
2024-05-28 11:51:42 +08:00 |
|
furongxin
|
edd2c36c35
|
追加bpm_oa_work_task 表的查询的数据权限
|
2024-05-28 11:42:21 +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 |
|
furongxin
|
6f1680fd72
|
任务分配 信息提醒参数追加
|
2024-05-28 10:14:18 +08:00 |
|
aikai
|
3798cb6a63
|
考勤按天/按周统计
|
2024-05-27 20:41:55 +08:00 |
|
aikai
|
9fb199404e
|
Merge branch 'dev' of http://47.97.8.94:19527/yj/zn-cloud into dev
|
2024-05-27 19:07:22 +08:00 |
|
aikai
|
e02347c992
|
统计按周期
|
2024-05-27 19:07:15 +08:00 |
|
furongxin
|
befcf23e50
|
Merge branch 'main' into dev
|
2024-05-27 17:39:43 +08:00 |
|
furongxin
|
dacf5f122b
|
Merge branch 'main' into frx
|
2024-05-27 15:36:36 +08:00 |
|
furongxin
|
fb0d08162b
|
日志查看 数据权限校验修改
|
2024-05-27 15:33:56 +08:00 |
|
aikai
|
fb77318851
|
删除考勤查询权限
|
2024-05-27 14:31:11 +08:00 |
|
aikai
|
7664d59676
|
通过考勤组id获得考勤组人员Ids
|
2024-05-27 14:26:11 +08:00 |
|
aikai
|
7c07b3ec50
|
Merge branch 'dev' of http://47.97.8.94:19527/yj/zn-cloud into dev
|
2024-05-27 11:40:13 +08:00 |
|
aikai
|
d2da94bf73
|
考勤统计
|
2024-05-27 11:40:04 +08:00 |
|
furongxin
|
8e261f0eed
|
Merge branch 'main' into frx
# Conflicts:
# yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/comment/WorkLogCommentServiceImpl.java
|
2024-05-27 10:10:25 +08:00 |
|
