bonus
/
gz_att
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
174 Commits 1 Branch 0 Tags 3.4 MiB
Commit Graph

174 Commits

Author SHA1 Message Date
史宗金 5c504b6208 Merge remote-tracking branch 'origin/main' 2025-01-23 17:01:16 +08:00
fl e315ab5d5d 同步考勤数据问题 2025-01-23 16:59:18 +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 a61a8a3715 同步考勤数据不能超过当天 2025-01-23 09:18:04 +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
fl ac54c8abda 月报表导出添加组织权限 2025-01-22 09:48:34 +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
lSun fd75c8b95b 模块数据隔离，bug修改 
Signed-off-by: lSun <15893999301@qq.com>
 2025-01-17 18:01:41 +08:00
fl 6aa7e58525 八大员bug修改完毕 2025-01-17 14:39:30 +08:00
lSun 0bfdd406cd 模块数据隔离，bug修改 
Signed-off-by: lSun <15893999301@qq.com>
 2025-01-15 19:02:05 +08:00
lSun 4b1b2e65d2 模块数据隔离，bug修改 
Signed-off-by: lSun <15893999301@qq.com>
 2025-01-15 15:08:37 +08:00
史宗金 2d9fe0e148 修改假期，节假日定时器 2025-01-15 10:50:08 +08:00
史宗金 7fb6106716 修改假期，节假日定时器 2025-01-14 13:02:34 +08:00
fl c800cdaeca 考勤bug修改完毕 2025-01-13 21:56:42 +08:00
lSun 3f9a4bc07c 模块数据隔离，bug修改 
Signed-off-by: lSun <15893999301@qq.com>
 2025-01-13 21:46:02 +08:00
fl 8d318628e0 考勤bug修改完毕 2025-01-13 20:55:58 +08:00
lSun 22060187c8 模块数据隔离，bug修改 
Signed-off-by: lSun <15893999301@qq.com>
 2025-01-11 22:06:53 +08:00
lSun 652e492770 模块数据隔离，bug修改 
Signed-off-by: lSun <15893999301@qq.com>
 2025-01-11 21:06:33 +08:00
史宗金 7ed73c85bd 修改假期，节假日定时器 2025-01-11 19:22:03 +08:00
史宗金 f4e3872bd8 修改假期，节假日定时器 2025-01-11 18:41:17 +08:00
lSun 9457ff7b21 模块数据隔离，bug修改 
Signed-off-by: lSun <15893999301@qq.com>
 2025-01-11 18:39:59 +08:00
史宗金 c119c328b4 Merge branch 'main' of http://192.168.0.56:3000/bonus/gz_att 2025-01-11 18:03:27 +08:00
史宗金 47777bc006 修改假期，节假日定时器 2025-01-11 18:02:58 +08:00
lSun c1310a2415 模块数据隔离，bug修改 
Signed-off-by: lSun <15893999301@qq.com>
 2025-01-11 15:44:36 +08:00
lSun 42f81f9c7b 模块数据隔离，bug修改 
Signed-off-by: lSun <15893999301@qq.com>
 2025-01-11 14:00:40 +08:00
fl 5090ce5bb2 考勤bug修改完毕 2025-01-10 23:18:13 +08:00
史宗金 c3007d0f5b 修改假期，节假日定时器 2025-01-10 13:42:02 +08:00
史宗金 a743cb9cd1 修改假期，节假日定时器 2025-01-10 13:36:27 +08:00
fl e4b0c3ad72 考勤规则添加范围和中午休息时间 
考勤明细出入次数查询修改
 2025-01-08 15:07:26 +08:00
lSun 8267ed338b 模块数据隔离，bug修改 
Signed-off-by: lSun <15893999301@qq.com>
 2025-01-07 11:09:31 +08:00
fl 66a6f755dc 导出修改 2025-01-07 02:05:52 +08:00
史宗金 69e2b67226 修改假期，节假日定时器 2025-01-07 01:47:43 +08:00
史宗金 5739f5c9dd Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	bonus-modules/bonus-system/src/main/java/com/bonus/system/att/tasks/WechatTasks.java
#	bonus-modules/bonus-system/src/main/resources/mapper/evection/EvectionMapper.xml
 2025-01-07 01:43:50 +08:00
fl 9edf29cc29 考勤明细应用数据问题修改 2025-01-06 18:53:54 +08:00
lSun 1f42175b89 模块数据隔离，bug修改 
Signed-off-by: lSun <15893999301@qq.com>
 2025-01-06 18:29:59 +08:00
hayu 83a1355e83 优化 2025-01-03 16:16:37 +08:00
史宗金 d158a84a98 修改请假临时外出，上午还是下午 2025-01-03 15:35:32 +08:00
fl dc0de44ac3 20250103问题修改 2025-01-03 14:12:06 +08:00
lSun 7c34233279 模块数据隔离，bug修改 
Signed-off-by: lSun <15893999301@qq.com>
 2024-12-27 00:25:16 +08:00
lSun dbcb1c4d98 模块数据隔离，bug修改 
Signed-off-by: lSun <15893999301@qq.com>
 2024-12-26 18:28:20 +08:00
lSun 88a5137b4f 模块数据隔离，bug修改 
Signed-off-by: lSun <15893999301@qq.com>
 2024-12-26 17:23:55 +08:00
lSun 35369ecc3f 模块数据隔离，bug修改 
Signed-off-by: lSun <15893999301@qq.com>
 2024-12-26 16:01:07 +08:00
史宗金 5d999bd16b 修改假期，节假日定时器 2024-12-26 11:24:17 +08:00
lSun 5463501e0d 消息提醒，数据隔离 
Signed-off-by: lSun <15893999301@qq.com>
 2024-12-25 21:50:55 +08:00
lSun 756af47a82 test环境 
Signed-off-by: lSun <15893999301@qq.com>
 2024-12-24 19:14:18 +08:00
fl d28d076925 bug修改 2024-12-24 19:04:57 +08:00
fl 5bbf88ac2a 考勤推送问题 
工作外出问题
 2024-12-24 09:21:34 +08:00
lSun 6af54dd884 权限分配 
Signed-off-by: lSun <15893999301@qq.com>
 2024-12-23 18:36:10 +08:00
lSun 4a88b43f4b 考勤明细 
Signed-off-by: lSun <15893999301@qq.com>
 2024-12-20 19:14:26 +08:00
fl 9ed3545405 历史考勤推送问题 2024-12-20 15:08:28 +08:00
lSun 097e271be9 消息提醒 
Signed-off-by: lSun <15893999301@qq.com>
 2024-12-19 19:08:18 +08:00
lSun 870381457b 消息提醒 
Signed-off-by: lSun <15893999301@qq.com>
 2024-12-19 16:53:44 +08:00
lSun e7a4871b18 数据看板 
Signed-off-by: lSun <15893999301@qq.com>
 2024-12-18 21:31:00 +08:00
lSun 588098c00a 数据看板 
Signed-off-by: lSun <15893999301@qq.com>
 2024-12-18 20:13:17 +08:00
lSun 81e7dd0329 人员信息、出差报备功能修改 
Signed-off-by: lSun <15893999301@qq.com>
 2024-12-18 16:55:00 +08:00
lSun 49ba6ddacb 人员信息、出差报备功能修改 
Signed-off-by: lSun <15893999301@qq.com>
 2024-12-17 19:25:00 +08:00
fl 827d195ef3 历史考勤推送问题 2024-12-17 16:47:06 +08:00
fl 7257eb68da 历史考勤推送问题 2024-12-17 16:46:54 +08:00
lSun e6b5e8aad4 出行人把申请人自动带入 
Signed-off-by: lSun <15893999301@qq.com>
 2024-12-16 18:28:20 +08:00
lSun a595d6a538 出行人把申请人自动带入 
Signed-off-by: lSun <15893999301@qq.com>
 2024-12-16 15:08:46 +08:00
fl f032ded697 考勤推送问题 
项目部角色权限相关问题
 2024-12-13 21:04:06 +08:00
fl 01a9f56eb8 人员修改组织，同步修改考勤组组织 2024-12-12 23:12:49 +08:00
fl 7714717268 数据推送跨月历史数据推送问题修改 
工作异常添加
 2024-12-12 23:12:47 +08:00
hayu c323536e2d 优化 2024-12-12 23:06:20 +08:00
hayu 86615ca026 优化 2024-12-12 18:44:08 +08:00
fl 2db149add4 数据推送修改 2024-12-09 19:36:44 +08:00
fl 3ab20a42e5 组织架构申请执行后加一个状态 2024-12-09 13:09:12 +08:00
fl 6bdeea141a 同步考勤数据到黔送 2024-12-06 23:02:50 +08:00
fl 913fdd2d1d 同步考勤数据到黔送 2024-12-06 23:02:30 +08:00
fl 471762750e 同步考勤数据到黔送 2024-12-06 23:01:30 +08:00
fl bbce2e5a2b 同步考勤数据到黔送 2024-12-06 10:59:06 +08:00
fl a3b07c2b9c 数据同步定时器全打开提交 2024-12-05 21:27:09 +08:00
lSun 1f27df6e64 权限分配 
Signed-off-by: lSun <15893999301@qq.com>
 2024-12-05 20:28:23 +08:00
lSun cd8c36d187 考勤规则设置 
Signed-off-by: lSun <15893999301@qq.com>
 2024-12-05 17:28:03 +08:00
lSun c6264a9d74 小程序打卡数据 
Signed-off-by: lSun <15893999301@qq.com>
 2024-12-05 16:37:08 +08:00
hayu f09138c298 优化 2024-12-05 13:28:36 +08:00
lSun bc105280a3 人脸识别 
Signed-off-by: lSun <15893999301@qq.com>
 2024-12-05 11:17:59 +08:00
fl cb3e7f9941 数据同步定时器全打开提交 2024-12-05 10:46:34 +08:00
fl 99d51e7f16 数据同步定时器全打开提交 2024-12-05 09:18:01 +08:00
hayu 1485618c2f 优化 2024-12-04 18:47:18 +08:00
fl 0adc753d86 组织架构变更定时修改 2024-12-04 18:31:58 +08:00
fl 20e289e496 人员信息添加考勤组 2024-12-04 17:45:56 +08:00
fl 518a39a5f5 人员信息添加考勤组 2024-12-04 17:42:41 +08:00
fl 8754856448 人员信息添加考勤组 2024-12-04 17:40:25 +08:00
fl 376582f73c 导出页面 2024-12-04 17:14:58 +08:00
fl e7b8c0872c Merge remote-tracking branch 'origin/main' 2024-12-04 16:36:41 +08:00
fl 7ce2dbe22a 添加查询接口返回值 2024-12-04 16:36:15 +08:00
lSun 9e968e5f0d 人脸识别 
Signed-off-by: lSun <15893999301@qq.com>
 2024-12-04 16:30:27 +08:00
fl 3c8e07cfe4 人脸更新 2024-12-04 16:27:28 +08:00
hayu c51e73ae07 优化 2024-12-04 14:49:38 +08:00
fl c9f5c3224a 人脸更新 2024-12-04 11:26:30 +08:00
fl e696b1992f 人脸更新 2024-12-04 11:13:15 +08:00
fl 0ca399d0f7 数据互通 2024-12-04 00:03:55 +08:00