Commit Graph

243 Commits

Author SHA1 Message Date
caoqianming e97879811f fix: 需要修改全局变量 2023-09-11 15:45:31 +08:00
caoqianming 3cc0134c5d fix: django value_list用错了 2023-09-11 15:30:04 +08:00
caoqianming 96ac80361e feat: 人脸数据保存在数据库中 2023-09-11 15:21:45 +08:00
caoqianming 5dded4d235 fix: face_find_from_base64 bug 2023-09-11 14:13:17 +08:00
caoqianming e71d5af84a feat: 增加人脸识别相关功能 2023-09-11 10:42:34 +08:00
caoqianming 4e06efdc78 refector: hrm serializer去除未使用的导入 2023-09-06 08:38:59 +08:00
caoqianming 4e6f4b249b fix: while 循环做card_door_authority的提高补偿机制次数 2023-05-09 17:02:41 +08:00
caoqianming eeca896a78 fix: 紧急bug 2023-05-09 09:52:54 +08:00
caoqianming ef95b3c51f feat: 查询用户列表可返回更详细的定位信息 2023-05-09 09:46:44 +08:00
caoqianming 702ef7641c fix: while 循环做card_door_authority的补偿机制4 2023-05-09 08:46:02 +08:00
caoqianming ca1a426182 fix: while 循环做card_door_authority的补偿机制3 2023-05-09 08:34:45 +08:00
caoqianming a395817028 fix: while 循环做card_door_authority的补偿机制2 2023-05-08 18:14:57 +08:00
caoqianming 8d3d1934b7 fix: while 循环做card_door_authority的补偿机制 2023-05-08 15:51:05 +08:00
caoqianming 33cc805172 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2023-05-05 09:40:24 +08:00
caoqianming b1ec172829 refector: 尝试访问卡片以确保卡片生成 2023-05-05 09:40:20 +08:00
caoqianming 923e812890 fix: ep update 不放在事务中 2023-04-27 14:43:01 +08:00
caoqianming 7128e67e92 fix: 人员导出excel信息bug 2023-04-19 19:29:18 +08:00
caoqianming bc6aa5cacc fix: 人员导出excel信息bug 2023-04-19 19:25:39 +08:00
caoqianming 9192d9ffda fix: 人员导出excel信息bug 2023-04-19 19:20:52 +08:00
caoqianming aefd513987 fix: swipe_next exception_type 保存bug 2023-04-19 18:43:49 +08:00
caoqianming 6a0929dc10 fix: swipe_next还是通过save,这样可见update_time 变动 2023-04-19 17:36:10 +08:00
caoqianming aa84d50957 feat: employee导出并增加是否有定位卡的筛选 2023-04-18 19:34:03 +08:00
caoqianming ba937ce751 refector: 一点优化 2023-04-14 16:54:10 +08:00
caoqianming d9c318de8e refector: 证书检索条件 2023-04-13 17:16:46 +08:00
caoqianming 50553bd0c0 fix: swip_next bug 2023-04-13 08:01:11 +08:00
caoqianming 68c54a73e3 refector: swipe_next 优化2 2023-04-12 17:10:38 +08:00
caoqianming f4aacc2129 refector: swipe_next 优化 2023-04-12 17:06:38 +08:00
caoqianming ebcef8721f fix: clock record view加入权限控制 2023-03-29 16:53:03 +08:00
caoqianming 0766cba363 Merge branch 'v2' 2023-03-29 16:36:03 +08:00
caoqianming 9b0de2e011 refector: user is_active用is_deleted统一处理 2023-03-28 10:46:34 +08:00
caoqianming a046fa46f0 fix: 打卡记录导出bug2 2023-03-24 17:52:37 +08:00
caoqianming e0210c4bef fix: 打卡记录导出bug 2023-03-24 17:49:33 +08:00
caoqianming ffb6ac2720 refector: hrm sync 加入dh enabled判断 2023-03-24 10:04:57 +08:00
caoqianming 1f8963514f refector: 离职或退休可提供当前8h内的门禁时间 2023-03-23 17:15:56 +08:00
caoqianming b217f30c59 fix: >10h算加班 2023-03-23 11:16:02 +08:00
caoqianming 1606213cbc refector: 打卡记录导出 2023-03-23 11:15:12 +08:00
caoqianming 6a328a25c8 refector: 证书编号可以不唯一 2023-03-17 11:25:07 +08:00
caoqianming be254372c0 fix: cr导出只显示上下班的 2023-03-16 13:25:37 +08:00
caoqianming 4478bb7b99 refector: cswipe_next优化 2023-03-16 12:28:48 +08:00
caoqianming 8fffce82b3 refector: correct_swip_task pageData 按 swingTime排序 2023-03-16 11:26:10 +08:00
caoqianming 7f8d7332aa refector: clock record detail还是多放一些信息 2023-03-16 00:08:39 +08:00
caoqianming 379f27fe48 refector: 刷卡推送优化detail添加channelCode 2023-03-15 23:45:11 +08:00
caoqianming 5dc43246e2 refector: hrm clockrecord 从大华侧请求带my_info数据 2023-03-15 23:13:21 +08:00
caoqianming ecbe077e55 fix: correct_swip_task bug 2023-03-15 21:12:02 +08:00
caoqianming 1c5e236e15 fix: swipe_next 先创建cr bug 2023-03-15 21:01:57 +08:00
caoqianming 0608d9045a fix: e_type为3 card_type判定 2023-03-15 20:14:54 +08:00
caoqianming dbf7fe7b20 fix: correct_swip_task bug 2023-03-15 18:13:53 +08:00
caoqianming 16daa861bd feat: 打卡记录增加忽略记录项目并进行代码优化 2023-03-15 18:07:42 +08:00
caoqianming 7cec134265 refector: correct_swip_task 从大华打卡记录里校正打卡记录 2023-03-15 00:29:01 +08:00
caoqianming f0b4544813 fix: 打卡记录推测bug 2023-03-14 23:17:56 +08:00
caoqianming 717c43ca50 feat: 增加考勤预测类型加班和缺卡并进行逻辑处理 2023-03-14 18:20:47 +08:00
caoqianming 5ebd884f18 离线刷卡记录订阅与推送处理 2023-03-14 15:04:00 +08:00
caoqianming f5ec3434d3 hrm 考勤推测优化 2023-03-13 16:55:52 +08:00
caoqianming 977c0527b1 刷卡考勤推测优化 2023-03-12 21:09:54 +08:00
caoqianming 5f1ac8ce40 刷卡考勤推测优化 2023-03-12 21:08:24 +08:00
caoqianming 367d9b31dd 打卡时判断异常情况 2023-03-10 16:07:59 +08:00
caoqianming f5432d3884 更改刷脸类型 correct_enter_or_exit 2023-03-02 23:31:19 +08:00
caoqianming e7af79a51a employee detail 取消door_range 字段 2023-03-02 22:29:04 +08:00
caoqianming 88db4fbcd4 hrm增加退休 2023-03-02 18:04:00 +08:00
曹前明 477bde5af8 面板机打卡bug 2022-11-24 13:14:19 +08:00
曹前明 c676106e61 办公楼面板机打卡 2022-11-23 16:12:02 +08:00
caoqianming 2ffb5c9e3d 导出excel key 不存在的bug 2022-11-18 16:49:13 +08:00
caoqianming 09b6d7b182 correct_card_time 2022-11-15 15:51:56 +08:00
caoqianming d4e2db10f1 同步门禁时间范围bug 2022-11-15 14:22:08 +08:00
caoqianming 0981700f30 wf run task 优化 2022-11-14 10:39:08 +08:00
caoqianming 1f03e108d3 等待卡片生成时间延长 2022-11-07 17:27:19 +08:00
caoqianming c4dea515a2 人员列表增加手机号检索 2022-11-07 10:42:41 +08:00
caoqianming 97bdde5888 hrm detail get_location bug 2022-11-03 16:12:45 +08:00
caoqianming 1bf37aa239 重跑一段时间的打卡记录bug 2022-11-03 13:08:37 +08:00
caoqianming 6c846386e6 重跑一段时间的打卡记录bug 2022-11-03 12:55:07 +08:00
caoqianming 9f6f3ddb62 重跑一段时间的打卡记录 2022-11-03 12:42:34 +08:00
caoqianming 8d5a2a0983 打卡bug修复 2022-11-03 11:25:03 +08:00
caoqianming d73a35da6b 打卡bug修复 2022-11-03 11:02:32 +08:00
caoqianming de8ae9d740 打卡bug修复 2022-11-03 10:41:57 +08:00
caoqianming 7f1e6f0c56 打卡排序/许可证排序 2022-11-02 17:09:51 +08:00
caoqianming c4c8bb1898 打卡逻辑更新 2022-11-02 13:19:47 +08:00
caoqianming faab2f954a 部分优化 2022-11-01 17:43:28 +08:00
caoqianming a973b62fe8 employee 支持belong_dept filter 2022-10-27 14:06:44 +08:00
caoqianming 2549adc08a 加入多个新算法 2022-10-26 18:10:25 +08:00
caoqianming fe2ae8cd35 打卡记录导出增加身份证号列 2022-10-26 17:58:59 +08:00
caoqianming 6f6ee439d7 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2022-10-26 08:42:53 +08:00
caoqianming 12c5aa5996 ep detail get_location bug 2022-10-26 08:42:50 +08:00
曹前明 9fd220f526 ep update 允许name变更 2022-10-25 21:28:52 +08:00
caoqianming 738da6d183 hrm ep detail返回详细定位信息 2022-10-25 16:20:22 +08:00
曹前明 99f84f48cd bind rpj bug 2022-10-24 09:04:36 +08:00
曹前明 98035be264 empolyee update dahua 2022-10-23 14:00:21 +08:00
曹前明 08d1faf97e 校正性别 2022-10-22 23:33:03 +08:00
曹前明 97710370b6 人脸识别阈值 2022-10-20 17:54:58 +08:00
曹前明 0f3ca55ac3 hrm signal bug 2022-10-20 15:31:29 +08:00
曹前明 f0ee937af7 打卡记录导出 2022-10-19 19:58:05 +08:00
曹前明 d4e9406666 clockrecord增加筛选/身份证号校验取消 2022-10-19 11:59:52 +08:00
曹前明 cfc6b072c6 缓存区域信息 2022-10-18 19:16:54 +08:00
曹前明 2ad6d2a3be visitor 注册时创建ep 2022-10-18 14:06:05 +08:00
曹前明 02c387daf4 hrm info get_or_create 2022-10-18 12:16:38 +08:00
曹前明 af61d75177 访客账户注册时关联已有人员优化 2022-10-18 11:38:20 +08:00
曹前明 fad13077f6 访客账户注册时关联已有人员 2022-10-18 10:19:35 +08:00
caoqianming 9227038836 clockrecord filter year month bug 2022-10-13 09:06:53 +08:00
曹前明 3a38ee28b9 单例模式修改 2022-10-04 11:19:06 +08:00
曹前明 4d11516869 卡片不存在做额外处理/增加清除日志任务 2022-09-26 17:46:16 +08:00
曹前明 cc2785d42e 第三方请求优化 2022-09-26 15:06:33 +08:00