 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 |