Commit Graph

841 Commits

Author SHA1 Message Date
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 aa4b938af0 feat: 变更版本号为2.00.12 2023-03-16 00:34:27 +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 e172f9b67a 更新版本号 2023-03-12 21:10:54 +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 6d63e338a3 变更版本号 2023-03-10 17:17:25 +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