Commit Graph

841 Commits

Author SHA1 Message Date
caoqianming 8fd9fef177 fix: 自动流转时transition_obj不能为空 2023-04-11 20:44:23 +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 407068670c refector: celery settings修改 2023-03-30 17:38:06 +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