Commit Graph

874 Commits

Author SHA1 Message Date
caoqianming 863a301cb8 refector: visit audit end 修改司机入厂逻辑 2023-05-24 17:35:51 +08:00
caoqianming 9dff134329 fix: algo channel 添加bug 2023-05-24 17:19:32 +08:00
caoqianming 936af7c4fe feat: 开始添加设备管理模块 2023-05-22 15:55:32 +08:00
caoqianming b1ded623fa feat: 增加报表模块 2023-05-11 16:20:36 +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 25e56b4bd0 feat: 查询用户列表可返回更详细的定位信息 2023-05-09 09:51:28 +08:00
caoqianming ef95b3c51f feat: 查询用户列表可返回更详细的定位信息 2023-05-09 09:46:44 +08:00
caoqianming b38e4860ac refector: 缓存区域信息带名字 2023-05-09 09:42:02 +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 f59426b426 fix: 后入厂时的reason pop出 2023-05-06 13:20:07 +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 c2c05a5075 fix: opl level可为空 2023-04-27 14:42:33 +08:00
caoqianming e6933f9fc4 fix: rpjmember update rpj获取错误 2023-04-27 11:31: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 3410f5d968 feat: MySchedule创建时自动获取汉语描述 2023-04-18 18:10:50 +08:00
caoqianming 0303184ceb feat: 阿里云短信加入auto_log装饰器 2023-04-17 08:21:07 +08:00
caoqianming 1c661631ea fix: 加签和加签完成接口需要校验 2023-04-17 00:05:32 +08:00
caoqianming a757321f5c fix: 解决cache_areas_info重复执行的问题 2023-04-15 21:10:16 +08:00
caoqianming c4805c8d8e fix: 相关方中途入厂时因事务引发的bug 2023-04-15 21:02:33 +08:00
caoqianming 3af691844b fix: rpj_member_leave 中更新当前入厂项目bug 2023-04-15 18:25:19 +08:00
caoqianming 59e89c19ba fix: 解决cache_areas_info重复执行的问题 2023-04-15 17:54:18 +08:00
caoqianming 64bdd72146 fix: snap_and_analyse时更新缓存 2023-04-15 17:32:58 +08:00
caoqianming 284a36e24c fix: snap_and_analyse时更新缓存 2023-04-15 17:32:44 +08:00
caoqianming 0b1323b41d feat: 支持开启服务侧算力监控 2023-04-14 17:20:32 +08:00
caoqianming ba937ce751 refector: 一点优化 2023-04-14 16:54:10 +08:00
caoqianming 65ff80db75 refector: 工作流脚本每次失败都记录日志 2023-04-14 16:53:35 +08:00
caoqianming 2d2f171c32 feat: tdevice 视频通道查询带third_info 2023-04-14 16:26:21 +08:00
caoqianming 03ac2a5b1b refector: 命名修改 2023-04-14 16:24:56 +08:00
caoqianming d9c318de8e refector: 证书检索条件 2023-04-13 17:16:46 +08:00
caoqianming c097b44e0c fix: 文件上传不做幂等操作 2023-04-13 09:45:13 +08:00
caoqianming 50553bd0c0 fix: swip_next bug 2023-04-13 08:01:11 +08:00
caoqianming 005919af19 fix: 直接请求user列表不应该返回删除的用户 2023-04-12 18:03:24 +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 8f2bea554f feat: 摄像头支持随时开启算法监控(每10s拍照) 2023-04-12 15:56:50 +08:00
caoqianming eea05cf6f3 refector: 事件处理取消一些限制 2023-04-12 15:50:58 +08:00
caoqianming 2b054107c0 fix: 非工单节点下的流转不继续 2023-04-12 14:20:48 +08:00
caoqianming 14dc063f59 refector: post请求进行幂等操作 2023-04-12 14:19:18 +08:00
caoqianming 0bb351fb99 fix: 修改opl level字段默认为空字符 2023-04-12 14:18:23 +08:00
caoqianming 9d68a7006e refector: 修改dpm字段 2023-04-12 14:17:45 +08:00
caoqianming 557f95e4cf fix: 权限cache维持300s 2023-04-10 14:57:41 +08:00
caoqianming 731c93ce71 fix: get_user_perms_map 中 data_range取最小值 2023-04-10 14:56:41 +08:00
caoqianming 1a61e5ab27 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2023-04-07 15:06:30 +08:00
caoqianming 121d6ec15c feat: 增加相关方黑名单 2023-04-07 15:06:26 +08:00
caoqianming a6f5137dff fix: close_visit_by_leave_time 待入厂也应正常关闭 2023-04-05 10:15:05 +08:00
caoqianming 8df57ed99a refector: 开启关闭监控加入日志记录 2023-04-05 10:04:35 +08:00
caoqianming 96c12108e0 fix: 工单流水号bug 2023-04-03 14:53:40 +08:00
caoqianming 4c4e637cc3 fix: rparty delete同步dept 2023-04-03 14:01:38 +08:00
caoqianming 7cbd581701 fix: rparty create时dept字段冲突2 2023-04-03 13:35:54 +08:00
caoqianming cd3a0393ad fix: 生成工单流水号bug 2023-04-03 13:19:06 +08:00
caoqianming 3baa41b504 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2023-04-03 12:44:17 +08:00
caoqianming ec6c1c3d84 fix: rparty create时dept字段冲突 2023-04-03 12:44:13 +08:00
caoqianming be530ca9b9 fix: am config修改 2023-04-02 10:18:24 +08:00
caoqianming e32f82ace7 refector: send_mail_task优化 2023-03-31 23:16:40 +08:00
caoqianming f2c02a76d4 refector: send_mail_task优化 2023-03-31 10:14:01 +08:00
caoqianming 876c7734f1 refector: 工单 bind_x 优化 2023-03-30 12:22:13 +08:00
caoqianming a415859a26 fix: 许可证在工单撤回状态下可以编辑 2023-03-30 11:13:35 +08:00
caoqianming 201eabf33e fix: filter_dept字段长度修改 2023-03-30 10:08:49 +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 7908b06cd1 fix: opl monitor不用celery 2023-03-29 10:22:41 +08:00
caoqianming 9b0de2e011 refector: user is_active用is_deleted统一处理 2023-03-28 10:46:34 +08:00
caoqianming 6d1c9e03c9 refector: 短信发送备用渠道,未写 2023-03-28 09:51:30 +08:00
caoqianming 76ce412741 fix: close_rpj_by_leave_time 执行 rpj_m_leave 2023-03-27 13:03:50 +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 1ed0a2542e fix: 入厂后账户启用 2023-03-24 17:34:42 +08:00
caoqianming 49abd43cf3 fix: 该项目成员已做离厂操作 2023-03-24 16:39:21 +08:00
caoqianming ce90e11c36 fix: idempotent 加入request_path 2023-03-24 16:38:51 +08:00
caoqianming 503953bb11 fix: 成员离厂有限制2 2023-03-24 16:23:56 +08:00
caoqianming 1966dde2c0 fix: 成员离厂有限制2 2023-03-24 16:20:50 +08:00
caoqianming 9d7739ae59 fix: 成员离厂有限制/大华启用才校验图片接口 2023-03-24 15:31:20 +08:00
caoqianming 068474f4e6 refector: rpjmember destory改回 2023-03-24 14:56:43 +08:00
caoqianming e2a6b669ff refector: rpj_member_leave 当前项目回写 2023-03-24 10:06:04 +08:00
caoqianming ffb6ac2720 refector: hrm sync 加入dh enabled判断 2023-03-24 10:04:57 +08:00
caoqianming 7c08b2374f fix: rpjlog缺少字段 2023-03-23 17:46:20 +08:00
caoqianming a4c54c48e0 feat: rpj member 后入厂和提前离厂 2023-03-23 17:42:44 +08:00
caoqianming 1f8963514f refector: 离职或退休可提供当前8h内的门禁时间 2023-03-23 17:15:56 +08:00
caoqianming 023dd12195 refector: 工单处理日志返回带签名图片 2023-03-23 13:48:58 +08:00
caoqianming 3c91e23cec refector: 正式环境500才发邮件 2023-03-23 13:48:13 +08:00
caoqianming 8628d0a74b fix: 事件通知只发给active的账号 2023-03-23 11:16: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 e4aad35f06 feat: 算法布设可开启实时监控任务(循环抓拍) 2023-03-21 18:17:55 +08:00
caoqianming 74b8681a8a fix: 更新入厂项目人员证书库按name 和 number 共同唯一 2023-03-17 17:54:50 +08:00
caoqianming 8b19556aff feat: 相关方出入厂人员添加去除等功能-待完成 2023-03-17 17:42:45 +08:00
caoqianming bb5e9925ea feat: 增加幂等装饰器并用在create方法上 2023-03-17 16:24:09 +08:00
caoqianming 6a328a25c8 refector: 证书编号可以不唯一 2023-03-17 11:25:07 +08:00
caoqianming f303801401 fix: rpj update 需要提供belong_dept和rparty 2023-03-17 09:28:54 +08:00