aikai
|
1257d8e288
|
增加加班时长/
|
2024-06-21 09:34:53 +08:00 |
|
aikai
|
c1b3031691
|
考勤打卡提醒
|
2024-06-19 18:32:03 +08:00 |
|
aikai
|
9fd8c803ff
|
修改定时任务bug
|
2024-06-14 17:10:06 +08:00 |
|
aikai
|
43287e22e5
|
考勤
|
2024-06-13 15:29:44 +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 |
|
aikai
|
e23d46b585
|
获取用户考勤组调整/获取打卡页面调整
|
2024-06-11 15:30:12 +08:00 |
|
aikai
|
f477e9e0e5
|
更新考勤组班次/更换考勤班次立即生效
|
2024-06-05 21:29:14 +08:00 |
|
aikai
|
76c23e976b
|
考勤组还有人员不允许删除 - 考勤组人员筛选
|
2024-06-05 17:39:42 +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 |
|
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 |
|
furongxin
|
d96580d6b1
|
考勤设备管理
|
2024-05-30 09:44:52 +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 |
|
furongxin
|
d39e08015c
|
考勤设备管理模块
|
2024-05-27 09:43:48 +08:00 |
|
aikai
|
7391de6ca6
|
Merge branch 'dev' of http://47.97.8.94:19527/yj/zn-cloud into dev
|
2024-05-24 09:57:40 +08:00 |
|
aikai
|
a6d8416e2d
|
考勤定时任务
|
2024-05-24 09:57:33 +08:00 |
|
furongxin
|
44b3cd0341
|
Merge branch 'dev' into frx
|
2024-05-23 14:32:06 +08:00 |
|
aikai
|
665e99cfc5
|
Merge branch 'dev-考勤' of http://47.97.8.94:19527/yj/zn-cloud into dev
|
2024-05-22 09:29:08 +08:00 |
|
aikai
|
8683207c31
|
资产模块
|
2024-05-21 19:09:58 +08:00 |
|
furongxin
|
2b53048bda
|
修改用户表，新增user_type字段
对用修改相应sql
|
2024-05-21 14:41:15 +08:00 |
|
aikai
|
e1733437bd
|
资产模块
|
2024-05-13 11:13:26 +08:00 |
|
aikai
|
8b42d7862f
|
Merge branch 'dev' of http://47.97.8.94:19527/yj/zn-cloud into dev-考勤
|
2024-05-08 09:34:56 +08:00 |
|
aikai
|
ff056c4477
|
调整获取日志统计bug调整
|
2024-04-28 11:45:09 +08:00 |
|
aikai
|
6b18bc3c6c
|
获取我管理的模版的统计
|
2024-04-28 09:33:18 +08:00 |
|
aikai
|
7d37b9b6aa
|
Merge branch 'dev' of http://47.97.8.94:19527/yj/zn-cloud into dev-考勤
|
2024-04-26 17:58:17 +08:00 |
|
aikai
|
cafd198037
|
考勤
|
2024-04-26 17:58:09 +08:00 |
|
aikai
|
383ada505f
|
用户头像调整
|
2024-04-22 09:52:09 +08:00 |
|
furongxin
|
7664cd2f6c
|
日志分页查询， 设置老板的情况，默认查询各个部门领导人的日志
|
2024-04-19 12:19:09 +08:00 |
|
aikai
|
be4f4278ba
|
加入距离计算工具类 新增考勤组班次子表
|
2024-04-18 14:37:37 +08:00 |
|
aikai
|
03e7fdad43
|
Merge branch 'dev' of http://47.97.8.94:19527/yj/zn-cloud into dev-考勤
|
2024-04-18 09:40:20 +08:00 |
|
furongxin
|
bf012eed22
|
Merge branch 'frx' into dev
|
2024-04-17 18:31:18 +08:00 |
|
furongxin
|
b731f509a9
|
日志详情分页查询字段修改
|
2024-04-17 18:30:34 +08:00 |
|
aikai
|
4c780ef8e6
|
Merge branch 'dev' of http://47.97.8.94:19527/yj/zn-cloud into dev-考勤
|
2024-04-17 16:49:47 +08:00 |
|
aikai
|
7dc595508d
|
sql调整
|
2024-04-17 16:37:36 +08:00 |
|
aikai
|
ba2005cd9a
|
Merge branch 'dev' of http://47.97.8.94:19527/yj/zn-cloud into dev-考勤
|
2024-04-17 15:09:47 +08:00 |
|
aikai
|
3d2d5df62c
|
Merge branch 'dev' of http://47.97.8.94:19527/yj/zn-cloud into dev
|
2024-04-17 14:49:05 +08:00 |
|
aikai
|
a51a8305cf
|
获取需要填写的历史记录
|
2024-04-17 14:48:56 +08:00 |
|
furongxin
|
24eb502c1e
|
日志详情 发起人名称、头像 查询修改
日志查看者sql修改 添加条件 查询除本人意外所有可查看者
日志查看者添加 特殊情况，研发部时手动添加查看者信息
|
2024-04-17 11:12:40 +08:00 |
|
aikai
|
78819fe92b
|
调整上一页下一页问题
|
2024-04-16 18:08:34 +08:00 |
|
aikai
|
6db501a2a3
|
Merge branch 'dev' of http://47.97.8.94:19527/yj/zn-cloud into dev
|
2024-04-16 18:01:30 +08:00 |
|
aikai
|
64e1a36755
|
调整上一页下一页问题
|
2024-04-16 18:01:06 +08:00 |
|
furongxin
|
a8fe45eadb
|
日志查询，可查看的用户筛选排除超级管理员
|
2024-04-16 17:03:59 +08:00 |
|
aikai
|
a1ff6a8378
|
调整统计页面问题/新增查询上一篇下一篇日志
|
2024-04-16 16:39:45 +08:00 |
|
aikai
|
5a1334b165
|
获取上一篇下一篇日志
|
2024-04-16 15:28:14 +08:00 |
|
aikai
|
9968cd58d5
|
调整登录时候操作日志导致的报错/xml表中添加删除判断
|
2024-04-16 10:17:37 +08:00 |
|
furongxin
|
e8aaad05f2
|
日志分页查询 sql修改
|
2024-04-15 20:07:28 +08:00 |
|