zcdsj
/
factory
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,130 Commits 3 Branches 36 Tags 10 MiB
Commit Graph

1099 Commits

Author SHA1 Message Date
caoqianming d6198889f4 fix: 矫正工单流水号 2023-06-08 10:11:33 +08:00
caoqianming e8886902f2 fix: 工单流水号+1 2023-06-08 10:05:42 +08:00
caoqianming a7df6d339c fix: 作业删除时 删除可能的工单出现的bug 2023-06-08 09:21:53 +08:00
caoqianming 5c94f144bd fix: apk upload 修改sysconf 2023-06-08 09:14:56 +08:00
caoqianming c4e44cda26 feat: 算法处理失败时邮件通知 2023-06-07 14:51:37 +08:00
caoqianming 9d9e670240 feat: enm models初步设计 2023-06-07 13:48:00 +08:00
caoqianming d10b68c2b2 feat: 暂时不检查作业人员就位事件 2023-06-07 09:51:44 +08:00
caoqianming 8d08e2dde1 fix: operation 支持直接删除管理员操作 2023-06-07 09:42:21 +08:00
caoqianming 364abe1a3b feat: operation 支持直接删除管理员操作 2023-06-07 09:16:17 +08:00
caoqianming 31f5a402c0 feat: 有限空间气体检测记录必填 2023-06-05 14:30:13 +08:00
caoqianming 50fe411b71 feat: operation 增加筛选条件 2023-06-05 12:50:33 +08:00
caoqianming 15db992dff refetor: 修改get_ticket_sn 参数type 2023-06-03 16:56:02 +08:00
caoqianming 5d7880ca64 fix: opl ticket 撤回时支持修改oplworker gascheck 2023-06-03 16:33:25 +08:00
caoqianming 46b0638bfb feat: 添加enm app 2023-06-02 17:50:41 +08:00
caoqianming 5ded2347b7 feat: 更改部分系统配置为json自定义 2023-06-01 17:12:07 +08:00
caoqianming 313005eb5c refector: tlog查看权限放开 2023-05-31 16:49:46 +08:00
caoqianming ae071d1d9c perf: dataset exec 缓存优化 2023-05-31 09:19:32 +08:00
caoqianming 8a1d43b7b8 refector: 删除相关方时将该部门的账户禁用 2023-05-29 09:06:09 +08:00
caoqianming a3d9fe4606 feat: 报表模块基础开发 2023-05-26 13:02:43 +08:00
caoqianming a1efcb46da fix: 事件删除权限 2023-05-25 17:12:22 +08:00
caoqianming 515952ef8d fix: 管理员返回所有权限代号 2023-05-25 11:19:23 +08:00
caoqianming 2d2edc1ab3 fix: 管理员返回所有权限代号 2023-05-25 10:51:39 +08:00
caoqianming b338cbc34c refector: 如果超出时间不检查人员未就位 2023-05-25 10:46:31 +08:00
caoqianming 5131daa5cd feat: 接口增加默认缓存时间 2023-05-25 10:45:41 +08:00
caoqianming 3d9f04a443 refector: 管理员返回所有权限代号 2023-05-25 10:44:05 +08:00
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
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 5826e407f5 refactor: operation patch 增加 dept_ter dept_bus 2023-03-14 16:30:19 +08:00
caoqianming 215b18314c 工单过滤字段支持反向查询 2023-03-14 16:03:44 +08:00
caoqianming 5a3c380dff opl visit rpj 添加ticket的related_name 字段 2023-03-14 16:02:22 +08:00
caoqianming 5ebd884f18 离线刷卡记录订阅与推送处理 2023-03-14 15:04:00 +08:00
caoqianming 15111a7a9a visit 增加vehicle_photos 字段及其接口修改 2023-03-13 17:40:57 +08:00
caoqianming f5ec3434d3 hrm 考勤推测优化 2023-03-13 16:55:52 +08:00
caoqianming 41e96084b8 开始写 monitor_and_analyse 方法 2023-03-12 22:32:33 +08:00
caoqianming 8ac24740db 获取大华视频rtsp流 2023-03-12 21:58:31 +08:00
caoqianming 977c0527b1 刷卡考勤推测优化 2023-03-12 21:09:54 +08:00
caoqianming 5f1ac8ce40 刷卡考勤推测优化 2023-03-12 21:08:24 +08:00
caoqianming 5f614bf164 限制属地和业务部门为本公司部门 2023-03-12 20:40:31 +08:00
caoqianming cf10e498a0 调整了cv2 绘制图框的颜色 2023-03-12 12:47:17 +08:00
caoqianming c12f057790 修改 dahua xunxi 登录的timeout为10 2023-03-12 09:35:59 +08:00
caoqianming cf26cc69a8 opl_end时close_mtask 参数类型错误 2023-03-12 08:09:49 +08:00
caoqianming dc5d3d184f 修改always_on默认值 2023-03-10 17:43:00 +08:00
caoqianming 7fdb9fb74f 强制修改工单状态 2023-03-10 17:38:38 +08:00
caoqianming 744f54874c Merge branch 'v2' 2023-03-10 17:10:10 +08:00
caoqianming 3200ef33fc Merge branch 'develop' 2023-03-10 17:10:00 +08:00
caoqianming e3749d81a2 Merge branch 'develop' into v2 2023-03-10 17:09:25 +08:00
caoqianming 1916747947 dpm migrations 2023-03-10 17:09:02 +08:00
caoqianming 57da3eddb4 myschedule migrations 2023-03-10 17:08:45 +08:00
caoqianming f54cd0028f tdevice 增加mtask_uid 2023-03-10 17:08:03 +08:00
caoqianming 367d9b31dd 打卡时判断异常情况 2023-03-10 16:07:59 +08:00
caoqianming 830dee3358 dhclient snap 有可能失败进行处理 2023-03-10 14:53:39 +08:00
caoqianming 5cb1331000 告警间隔时间内不触发 2023-03-10 14:53:11 +08:00
caoqianming 403b97568a Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2023-03-09 23:59:58 +08:00
caoqianming 7a37428b0f 修改my_log文件名为decorators 2023-03-09 23:59:41 +08:00
caoqianming be30c4d234 管理员重置密码 2023-03-09 10:54:41 +08:00
caoqianming d91c0b2bfe 相关方访客入厂关闭时同时关闭工单 2023-03-09 09:46:34 +08:00
caoqianming d0b6e46613 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_server into v2 2023-03-08 17:34:39 +08:00
caoqianming ee4a0448ca 如果账户禁用，不再发送短信通知 2023-03-08 17:34:21 +08:00
caoqianming 006f0ace98 Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_server into v2 2023-03-04 23:16:53 +08:00
caoqianming f184ddc094 准备写实时监控rtsp进行算法识别 2023-03-04 23:15:54 +08:00
caoqianming 6cdf791429 am ready cache_area_info 2023-03-04 23:15:28 +08:00
caoqianming 6f25ebdd42 ecm algochannel 变更为always_on 为false 2023-03-03 10:03:41 +08:00
caoqianming f96a62d5e9 增加myschedule model 2023-03-03 10:03:10 +08:00
caoqianming 0bb4595ee6 增加myschedule 2023-03-03 10:02:41 +08:00
caoqianming 0a59af9c65 增加edu app 2023-03-03 10:02:09 +08:00
caoqianming 2aad51811c 增加dpm 双控app 2023-03-03 10:01:37 +08:00
caoqianming f5432d3884 更改刷脸类型 correct_enter_or_exit 2023-03-02 23:31:19 +08:00
caoqianming 3c3bb556db monitor drflog view_method字段增加 2023-03-02 23:30:51 +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
caoqianming 34de8fdfec sms.py 优化 2023-03-02 16:58:38 +08:00
caoqianming 029459ce5e mylog, tasks, wxmp优化 2023-03-02 16:57:23 +08:00
caoqianming 4ab329c043 添加edu app 2023-02-21 10:39:31 +08:00
caoqianming ab880ae8ad 工作流查询优化 2023-02-20 09:07:03 +08:00
caoqianming 6c04d161f8 config 操作函数 2023-02-20 09:04:36 +08:00
caoqianming 9776ef42cd 添加websocket auth middleware 2023-02-20 09:03:51 +08:00
caoqianming c350c40941 开发模式下返回500详细信息 2023-02-20 09:02:49 +08:00
caoqianming e0945986a3 取消cache areas info 2023-02-17 00:12:19 +08:00
caoqianming 989e0930f2 更改sys_version 2023-02-16 11:26:20 +08:00
caoqianming bad884ce26 添加auto_log装饰器 2023-02-14 11:02:29 +08:00
caoqianming 74f6b737cb opl task daemon True 2023-02-14 10:31:10 +08:00
caoqianming 6960593041 绘制矩形框bug2 2023-02-13 17:16:32 +08:00
caoqianming 83467dceb4 绘制矩形框bug 2023-02-13 16:25:48 +08:00
caoqianming a7d60d69ae 算法测试 2023-02-13 16:09:50 +08:00
caoqianming d638448fa6 算法 log 一下 2023-02-13 15:57:02 +08:00
caoqianming d7a6adead7 opeartion partial update 2023-02-13 15:19:25 +08:00
caoqianming 0b8884cc2a 图片压缩功能 2023-02-13 15:18:54 +08:00
caoqianming 1dfb9626cc wf 更改ticket 状态接口 2023-02-12 21:05:56 +08:00
caoqianming 1833c1a7ff 开启关闭任务优化 2023-02-11 18:32:41 +08:00
caoqianming 5a25bfe343 开启关闭任务优化 2023-02-11 17:50:49 +08:00
caoqianming 870d87b44d 彻底停止作业监控 2023-02-11 17:14:43 +08:00
caoqianming 940f07033c opm start_mtask 关闭不可开启 2023-02-11 16:35:19 +08:00
caoqianming eda09432f4 operation path vchannels 2023-02-11 16:28:23 +08:00
caoqianming 9a9fe62baa 未知人员修改为人员 2023-02-11 16:27:56 +08:00
caoqianming 5b04858d2e 开启作业监控前关闭可能存在的 2023-02-10 12:21:15 +08:00
caoqianming 1646621844 开启作业监控前关闭可能存在的 2023-02-10 12:07:43 +08:00
caoqianming 93a00363b2 事件记录导出完成 2023-02-09 08:51:40 +08:00
caoqianming cb33dcb021 导出事件excel part2 2023-02-08 23:14:14 +08:00
caoqianming 73b0ce7cb7 事件导出excel part1 2023-02-08 17:33:55 +08:00
caoqianming afdd7a67ca Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2023-02-07 21:09:01 +08:00
caoqianming 90f79a7c99 wf报错优化 2023-02-07 21:08:57 +08:00
caoqianming bcef2026b0 ticketflow 增加 transition_ 返回 2023-01-30 13:41:07 +08:00
caoqianming f34b40ed3c rparty list search 2023-01-03 09:16:35 +08:00
caoqianming 2e67bcd48b 合并冲突 2023-01-02 23:22:01 +08:00
caoqianming 4d96f2d77a third dahua xunxi speaker 优化3 2023-01-02 23:19:18 +08:00
caoqianming cf0ac02660 third dahua xunxi speaker 优化2 2022-12-31 20:21:01 +08:00
caoqianming 7e3a1f4f78 third dahua xunxi speaker 优化 2022-12-24 14:10:22 +08:00
caoqianming ceb86617e2 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2022-12-24 14:04:26 +08:00
caoqianming 0fdfac0ae2 格式化 2022-12-24 14:04:10 +08:00
caoqianming d388871e7c speaker.py 优化 2022-12-23 17:42:04 +08:00
caoqianming 76b1fa0b82 dahua xunxi exception bug 2022-12-23 17:21:57 +08:00
caoqianming 46a1fcf50a workflow clone 接口 2022-12-22 16:58:31 +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 58cd565977 event handle bug 2022-11-18 08:57:08 +08:00
caoqianming e84f012e09 获取三方token优化 2022-11-17 17:50:17 +08:00
caoqianming e24c632593 事件处理bug 2022-11-17 17:23:22 +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 95dbaeee5f ticket list 返回待处理人 bug 2022-11-15 11:30:23 +08:00
caoqianming 4418e62ed6 dbbackup url 2022-11-14 13:07:16 +08:00
caoqianming 0981700f30 wf run task 优化 2022-11-14 10:39:08 +08:00
caoqianming 839e11b575 clear_dbbackup bug 2022-11-11 14:30:14 +08:00
caoqianming 03323fec17 数据库删除备份2 2022-11-11 14:25:53 +08:00
caoqianming 774db13d92 数据库删除备份 2022-11-11 14:18:26 +08:00
caoqianming b999ef60b3 数据库备份任务和查看接口 2022-11-11 10:02:42 +08:00
caoqianming 2badb9c45c 复杂查询 swagger 2022-11-10 15:32:25 +08:00
caoqianming d961a02378 cquery try 一下 2022-11-10 14:47:48 +08:00
caoqianming f942540b49 提供复杂查询接口 2022-11-10 14:12:03 +08:00
caoqianming c12d356b34 500邮件埋点 2022-11-10 10:14:09 +08:00
caoqianming e47c9cd0ad send_mail_task 默认参数 2022-11-10 09:48:58 +08:00
caoqianming b09e3e396a 工单脚本执行增加重试机制 2022-11-10 09:37:43 +08:00
caoqianming 19cfad5412 event service ec_codes 默认{} 2022-11-09 11:27:15 +08:00
曹前明 b04473cc3b 小优化 2022-11-07 22:07:03 +08:00
曹前明 dd3f3857b8 先关闭安全帽补偿机制 2022-11-07 21:51:52 +08:00
caoqianming 1f03e108d3 等待卡片生成时间延长 2022-11-07 17:27:19 +08:00
caoqianming c4dea515a2 人员列表增加手机号检索 2022-11-07 10:42:41 +08:00
曹前明 22e9bb38c3 邮件发送测试 2022-11-07 08:07:32 +08:00
曹前明 91f20a73af rpj, visit, opl删除时同步删除工单 2022-11-04 07:20:17 +08:00
曹前明 b0cf23834a 获取处理人bug 2022-11-04 06:57:30 +08:00
caoqianming 97bdde5888 hrm detail get_location bug 2022-11-03 16:12:45 +08:00
caoqianming 5b7b180ee1 清除日志记录,可更改时间 2022-11-03 16:01:37 +08:00
caoqianming 2448406e97 计算区域人员数量bug 2022-11-03 15:45:13 +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 64a331a825 swagger bug 2022-11-02 15:18:30 +08:00
caoqianming a5940c869c 安全帽识别增加补偿机制 2022-11-02 13:24:04 +08:00
caoqianming c4c8bb1898 打卡逻辑更新 2022-11-02 13:19:47 +08:00
caoqianming 3ee00bdbcf apk get 无需登录 2022-11-02 13:02:43 +08:00
caoqianming faab2f954a 部分优化 2022-11-01 17:43:28 +08:00
caoqianming 27dd44d436 visit audit bug 2022-11-01 15:21:51 +08:00
caoqianming 80108274ea visit_driver_end bug 2022-11-01 14:31:09 +08:00
caoqianming 10f19272eb visit belong_dept 默认公司 2022-11-01 13:52:12 +08:00
caoqianming d9190abdd5 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2022-11-01 12:57:10 +08:00
caoqianming 7d71834c02 bind visit bug 2022-11-01 12:57:08 +08:00
曹前明 f6b0f75073 许可证增加排序 2022-10-31 21:57:55 +08:00
曹前明 f2aadec871 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2022-10-30 21:57:52 +08:00
曹前明 b57ff355c3 rpj create 返回信息 2022-10-30 21:57:48 +08:00
caoqianming a787c02fa6 save_dahua_pic提供自定义路径 2022-10-28 17:13:42 +08:00
caoqianming 874d427df3 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2022-10-28 16:36:54 +08:00
caoqianming 4fa0bb11d1 页面文字修改 2022-10-28 16:36:49 +08:00
曹前明 bdc57a91c9 未穿防烫服事件 2022-10-27 21:49:56 +08:00
曹前明 1dba032737 算法img bug 2022-10-27 21:37:50 +08:00
caoqianming 22412d0be1 相关方/访客项目可进行删除操作 2022-10-27 17:39:27 +08:00
caoqianming 55176e2cfe visit belong_dept 2022-10-27 15:59:39 +08:00
caoqianming a973b62fe8 employee 支持belong_dept filter 2022-10-27 14:06:44 +08:00
caoqianming 44778466cc ai_analyse bug 2022-10-27 13:23:28 +08:00
caoqianming ae2397595f ai_analyse bug 2022-10-27 13:19:58 +08:00
caoqianming 5f3eee5c7c ai_analyse bug 2022-10-27 13:16:34 +08:00
caoqianming c05add8952 算法识别结果尝试加入矩形框 2022-10-27 12:03:09 +08:00
caoqianming 19cbd6dd2a 算法优化一下 2022-10-27 10:25:11 +08:00
caoqianming 9aeb2510a9 Merge branch 'master' of https://e.coding.net/ctcdevteam/ehs/ehs_server 2022-10-27 10:07:12 +08:00
caoqianming 0a1b068ea1 develop 增加测试接口 2022-10-27 10:07:09 +08:00
曹前明 5b32b838eb 算法识别bug 2022-10-26 21:47:49 +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
曹前明 90a4e46cc8 rpm分配账号可选已有的/至少选择一位访客/成员 2022-10-24 19:02:19 +08:00
曹前明 99f84f48cd bind rpj bug 2022-10-24 09:04:36 +08:00