Commit Graph

584 Commits

Author SHA1 Message Date
caoqianming 2eee763405 fix: 日期字符允许使用空值 2023-09-05 17:16:44 +08:00
caoqianming 6167f5ee24 feat: 增加字体方案选择 2023-09-04 16:08:53 +08:00
caoqianming 65138de330 Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search 2023-09-01 16:20:42 +08:00
caoqianming ada16b9de9 feat: save时调用make_img_x 2023-09-01 16:20:39 +08:00
shijing 066fec4e8a fix : 时间戳 2023-09-01 15:35:10 +08:00
shijing 40cc5fc5b9 Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search 2023-09-01 15:23:12 +08:00
shijing b0432ef3a8 fix : 0901 2023-09-01 15:23:10 +08:00
caoqianming 2491f282a6 feat: certificate page 2023-09-01 14:57:38 +08:00
caoqianming 66abf6b402 feat: 证书修改背景 2023-09-01 14:09:24 +08:00
shijing 1378eb0de2 feat:修改依赖地址 2023-08-31 15:10:58 +08:00
shijing f1308e262c Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search 2023-08-31 15:04:22 +08:00
shijing d41b3699cd feat: 修改静态js地址 2023-08-31 15:03:04 +08:00
caoqianming 7b38bea67f Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search 2023-08-31 14:51:05 +08:00
caoqianming 625c3bc822 feat: certificate增加查询条件 2023-08-31 14:51:02 +08:00
shijing 16e79c58d9 证书 2023-08-30 13:39:38 +08:00
shijing 1c376cf99e 证书信息展示 2023-08-30 13:01:11 +08:00
shijing 8c04904626 Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search 2023-08-30 12:59:11 +08:00
shijing adec8254f5 文案显示 2023-08-30 12:59:07 +08:00
caoqianming 90774ebd8d feat: 修改settings的dist static 2023-08-30 11:46:36 +08:00
caoqianming 8a4db4911f Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search 2023-08-30 11:40:11 +08:00
caoqianming 2889af4b02 fix: 生成证书bug 2023-08-30 11:40:08 +08:00
shijing affc632bbe 0830 2023-08-30 11:16:13 +08:00
shijing 27251039ab 0830 2023-08-30 11:02:03 +08:00
shijing 040e4326a3 添加提示 2023-08-29 14:43:23 +08:00
caoqianming c0c8a684bb feat: 增加证书查询html 2023-08-29 12:08:32 +08:00
caoqianming 03707b94d9 feat: 校验media 忽略cert文件夹 2023-08-28 17:36:07 +08:00
caoqianming 3e0c6e31fc feat: 校验media 2023-08-28 17:16:38 +08:00
caoqianming 65e8069b7e feat: 证书查询放行get请求 2023-08-28 17:08:10 +08:00
caoqianming 9d233c1c45 feat: 证书增加查询条件 2023-08-25 17:04:37 +08:00
caoqianming 5ac980305f feat: 更新证书查询创建图片后端3 2023-08-23 15:57:23 +08:00
caoqianming e8a45486cc feat: 更新证书查询创建图片后端2 2023-08-23 15:37:07 +08:00
caoqianming 5e747884dc feat: 更新证书查询创建图片后端 2023-08-23 15:36:46 +08:00
caoqianming 7c601701ba feat: policy 添加cate字段 2023-08-21 15:04:30 +08:00
caoqianming e1d7167e1d feat: group_by_dept优化 2023-08-01 11:32:43 +08:00
caoqianming ff7eefb39b feat: group_by_dept优化 2023-08-01 11:28:05 +08:00
caoqianming 861aec80a3 feat: group_by_dept优化 2023-08-01 11:26:07 +08:00
caoqianming 39e98f4e69 feat: group_by_dept优化 2023-08-01 11:23:34 +08:00
caoqianming 70c5baa567 feat: 集团统计接口 2023-07-31 16:40:35 +08:00
caoqianming a0a18272a9 feat: 分页限额设置为5000 2023-07-10 12:14:40 +08:00
caoqianming 13ecf7fa3a feat: 分页限额设置为1000 2023-07-10 11:20:27 +08:00
caoqianming b24ba07f9b feat: 更改字段类型 2023-07-07 17:40:27 +08:00
caoqianming 4ba44cdf94 fix: 导入时日期校验失败4 2023-06-28 12:12:39 +08:00
caoqianming a6c3e0fd48 fix: 导入时日期校验失败3 2023-06-28 10:57:11 +08:00
caoqianming b03384ea61 fix: 导入时日期校验失败2 2023-06-28 10:22:30 +08:00
caoqianming 14c212a484 fix: 导入时日期校验失败 2023-06-28 10:09:15 +08:00
caoqianming e2126ff0b7 fix: 我的任务2修改 2023-06-26 09:45:31 +08:00
caoqianming 59630d8c51 fix: 我的任务2修改 2023-06-26 09:33:26 +08:00
caoqianming fd6c8c138e feat: 报送其他任务删除时删除报送记录 2023-06-26 09:09:51 +08:00
caoqianming 91b67940e2 fix: task2 start 不限制task2 的状态 2023-06-25 14:54:34 +08:00
caoqianming 0840479e39 feat: task2do增加删除功能 2023-06-25 14:47:05 +08:00
caoqianming 66cfee6e3d feat: pgoaldept支持多条件查询 2023-06-19 10:04:04 +08:00
caoqianming 38e337fce7 fix: 日常监督少统计num_acc字段 2023-06-16 13:46:16 +08:00
caoqianming 3863e8c83f fix: 导入时需要统计执行情况 2023-06-16 13:37:49 +08:00
caoqianming 9ebdd24015 fix: 修改导入task2do的bug 2023-06-15 14:39:18 +08:00
caoqianming 154886e2e7 fix: pgoal_file bug 2023-06-06 14:52:45 +08:00
caoqianming ea0ce8f752 feat: goal_files_ 返回详细信息 2023-06-06 14:46:39 +08:00
caoqianming 9ff19a004f fix: task2已关闭不可编辑 2023-06-06 14:43:42 +08:00
caoqianming 55d172588a fix: task2 start bug 2023-06-06 14:27:40 +08:00
caoqianming ea5f4c0a29 fix: 修改字段 2023-06-06 10:44:06 +08:00
caoqianming 7ce6fecb35 feat: task2增加截止日期 2023-06-05 17:03:33 +08:00
caoqianming c86e0a77e9 feat: 去除goal_o_file 无用字段2 2023-06-05 17:00:39 +08:00
caoqianming a07d0c034d feat: 去除goal_o_file 无用字段 2023-06-05 15:44:55 +08:00
caoqianming 4bf80699bd fix: pgoal dept update 时也进行计算 2023-06-05 15:39:18 +08:00
caoqianming b6ca08a3f0 refector: norecord优化 2023-06-01 14:11:22 +08:00
caoqianming 2595a51390 fix: no record bug 2023-06-01 14:03:12 +08:00
caoqianming a7d2c4f8c4 feat: norecord时num_pt_10 也为0 2023-06-01 13:45:41 +08:00
caoqianming 9cbd7ff12e feat: 增加统计字段完成 2023-05-31 16:38:49 +08:00
caoqianming 1d31f80c92 feat: 增加统计字段 2023-05-31 16:31:43 +08:00
caoqianming 46e9607942 feat: 增加commonadmodel 2023-05-30 14:46:52 +08:00
caoqianming ca5f75177b feat: pgoaldept增加task2do筛选条件 2023-05-29 17:28:27 +08:00
caoqianming 2c168411de fix: 年度基础目标使用物理删除 2023-05-29 17:08:28 +08:00
caoqianming 610e7850d3 fix: countnum_task2do_field bug 2023-05-29 15:56:55 +08:00
caoqianming 10feb5493a fix: 创建pt bug 2023-05-29 15:46:40 +08:00
caoqianming 1c9e7a8769 fix: 查询条件有误 2023-05-29 15:09:03 +08:00
caoqianming d533b1c93c feat: 增加筛选条件 2023-05-29 14:42:56 +08:00
caoqianming 4f58ed67e0 feat: 表格导入接口完成 2023-05-29 13:47:01 +08:00
caoqianming 45e95ad014 refector: 同步数据库 2023-05-29 12:07:07 +08:00
caoqianming 459caa7667 fix: 修改字段名 2023-05-29 08:39:18 +08:00
caoqianming 89b90f8e66 fix: save_num bug 2023-05-26 17:08:43 +08:00
caoqianming e8dbb8df24 fix: goal_value_a可为空值 2023-05-26 16:47:17 +08:00
caoqianming 5069d1b7fe fix: pgoaldept create validate bug 2023-05-26 16:42:49 +08:00
caoqianming 43dc1d176e fix: pgoaldept create validate bug 2023-05-26 16:36:51 +08:00
caoqianming 3b95625d04 feat: 返回goal_o_file_ 2023-05-25 16:04:00 +08:00
caoqianming 91ac2f29f9 refector: 更新库版本.修改bug 2023-05-23 14:55:24 +08:00
caoqianming 90900bf71e fix: task2 start bug 2023-05-23 14:17:50 +08:00
caoqianming f41a8292d6 fix: 权限配置错误 2023-05-23 14:13:25 +08:00
caoqianming f9f3a256b8 fix: task2 update pop 不报错 2023-05-22 17:15:27 +08:00
caoqianming 36b608197e fix: task2do my 错误 2023-05-22 16:35:57 +08:00
caoqianming c9c9d136a1 fix: 更新数据库task2 default 2023-05-22 15:20:24 +08:00
caoqianming cbf274cc7c fix: 添加保存num_issue接口 2023-05-17 17:03:24 +08:00
caoqianming c6fd6b93ab feat: 完成大部门新日常监督接口 2023-05-17 14:36:32 +08:00
caoqianming bffb1811df feat: 检查条款类型增加 2023-05-11 10:03:55 +08:00
caoqianming 5c65961776 feat: 新日常监督功能设计说明 2023-05-11 10:02:06 +08:00
caoqianming 3287200a55 fix: import_cma2不事先删除 2023-04-07 12:13:42 +08:00
caoqianming 7269479ff6 fix: gitignore 追踪错误 2023-04-07 10:43:43 +08:00
caoqianming fae6fbde88 fix: 导入时使用get('')结构,并先删除文件夹 2023-04-07 10:40:36 +08:00
caoqianming 2dfaa6a273 变更taction model 为commonamodel 2023-03-08 12:11:52 +08:00
caoqianming fce452e41e 变更taction model 为commonamodel 2023-03-08 12:11:26 +08:00
caoqianming fd1aa62cb0 TAction关联检测报告 2023-03-07 14:20:20 +08:00
caoqianming 7c565f9bb6 Taction 增加 type 字段 2023-03-07 13:57:16 +08:00
caoqianming a6ae4bd004 批量删除所属公司2 2023-03-07 13:22:35 +08:00
caoqianming 818021df6e 批量删除所属公司 2023-03-07 11:22:50 +08:00
caoqianming 51dcf1191b 创建新日常监督tr和ta表 2023-03-03 11:02:16 +08:00
caoqianming b26f2b75f8 观看统计bug 2022-12-21 10:46:13 +08:00
caoqianming 949fd2c3a6 观看统计bug 2022-12-21 10:37:06 +08:00
caoqianming aa2c4d8d10 完成播放接口修改 2022-12-05 14:36:21 +08:00
caoqianming fc79e0b782 观看人数bug 2022-12-05 14:15:49 +08:00
caoqianming 4d352a1773 Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search 2022-12-05 14:08:20 +08:00
caoqianming e3f6ed80ac 排序desc修改 2022-12-05 14:08:17 +08:00
曹前明 7ab775d1cb fix conflict 2022-11-28 10:15:38 +08:00
曹前明 4d0cb487e1 修改文字 2022-11-28 10:13:35 +08:00
caoqianming 4895d0a334 考试增加是否公开字段 2022-11-22 10:15:07 +08:00
caoqianming ff32c4e763 bug修改 2022-11-18 13:29:32 +08:00
caoqianming 9c7734820a 统计sql 完成 2022-11-17 18:17:53 +08:00
caoqianming 6d3e304359 增加category big 2022-11-17 09:50:51 +08:00
caoqianming 870587e878 ViewItem update 2022-11-17 09:04:43 +08:00
caoqianming f230990f2a 修改bug 2022-11-16 17:11:42 +08:00
caoqianming 666ed5968a 视频统计修改 2022-11-16 16:45:54 +08:00
caoqianming e12a815cdd 答卷返回顺序有误 2022-11-15 15:32:10 +08:00
caoqianming e22aed286b 考试记录权限 2022-11-14 15:56:27 +08:00
caoqianming f16b7e7b45 考试记录详情接口 2022-11-14 15:46:57 +08:00
caoqianming 10104b88f6 判卷bug2 2022-11-14 14:33:53 +08:00
caoqianming 4f1d695e5f 判卷bug 2022-11-14 14:31:12 +08:00
caoqianming 692c096f8d er create_by bug 2022-11-14 14:08:39 +08:00
caoqianming f3b52511b5 答题bug修改 2022-11-14 11:13:47 +08:00
caoqianming 086c701cfa 增加coustommixin 2022-11-11 16:42:53 +08:00
caoqianming 238e6988f4 题目列表返回questioncat_name 2022-11-11 16:22:01 +08:00
caoqianming 7d63942616 30分钟内播放算播放一次 2022-11-11 15:44:51 +08:00
caoqianming 39a8eb9740 serializer 修改 2022-11-08 16:19:54 +08:00
caoqianming 701784fb53 考试api基本完成3 2022-11-08 13:20:05 +08:00
caoqianming 2c643ca269 考试api基本完成2 2022-11-08 10:06:40 +08:00
caoqianming d5b9e183c1 model更新 2022-11-08 09:18:54 +08:00
caoqianming 295d5f886d 考试api基本完成 2022-11-07 18:16:48 +08:00
caoqianming d45afb9861 paper 字段修改 2022-11-04 17:14:49 +08:00
caoqianming 851e9291ab cma_search 修改 2022-11-04 17:11:50 +08:00
caoqianming 47deee8567 增加paper表等 2022-11-03 17:40:40 +08:00
caoqianming b4ea42de83 qtask 可看下级 2022-11-02 15:59:19 +08:00
caoqianming adf5957f70 qtask 可看下级 2022-11-02 15:50:38 +08:00
caoqianming 81d99a168c qtask 可看下级 2022-11-02 15:33:17 +08:00
caoqianming 5c60627313 该视频的本人观看信息bug 2022-10-31 14:22:20 +08:00
caoqianming 28fa3cb825 settings_pro 不加入git 2022-10-31 11:31:42 +08:00
caoqianming cc30c9babf 创建题目分类/题目表 2022-10-31 10:14:44 +08:00
caoqianming d4a8c9dfa0 Pagenation bug 2022-10-12 17:04:16 +08:00
caoqianming 425bc42702 更新gitignore 2022-10-12 16:42:41 +08:00
caoqianming d819dccc08 统计观看时长/登录日志 2022-10-12 16:38:30 +08:00
曹前明 7b956f5ef5 qorg bug 2022-06-30 10:11:41 +08:00
曹前明 0b285d34b2 qaction 统计错误 2022-06-30 09:57:36 +08:00
曹前明 f6609cd387 同步数据库 2022-06-29 13:26:50 +08:00
曹前明 4c2c0db577 ability 增加destory接口 2022-06-29 11:07:34 +08:00
曹前明 10c067240f 更新缓存功能 2022-06-21 14:20:21 +08:00
曹前明 a435834a33 增加grade 为实验室检验机构 2022-06-07 14:46:21 +08:00
曹前明 48b7267bb1 权限代码修改 2022-06-07 09:55:11 +08:00
曹前明 97ea46bed5 新增资质无变化能力无变化 2022-06-07 09:00:21 +08:00
曹前明 5a9524eef0 新增资质无变化能力无变化 2022-06-07 08:59:35 +08:00
曹前明 32ddaeacae 尝试修改 2022-06-06 15:32:54 +08:00
曹前明 bad4e27c0d qualiupdate bug 2022-06-06 15:24:13 +08:00
曹前明 c5070eee2e qaction detail 接口 2022-06-06 14:57:08 +08:00
曹前明 a9b00f638f qaction quali update bug 2022-06-06 14:07:25 +08:00
曹前明 76882a3d83 serializer 增加end_date 2022-06-06 13:52:32 +08:00
曹前明 f54906b328 quali增加file字段 2022-06-06 13:42:42 +08:00
曹前明 a9c8e7da4d 新增能力增加多个数量字段 2022-06-06 13:29:43 +08:00
曹前明 54c7d7719d value2 dict bug 2022-06-06 09:27:22 +08:00
曹前明 33eb8ffbc7 service_ok bug 2022-06-06 09:04:41 +08:00
曹前明 28f7e26206 value2 detail 2022-06-06 08:40:13 +08:00
曹前明 9332e5fc34 删除权限 2022-06-02 16:28:41 +08:00
曹前明 b9e66f4bd7 返回详细内容 2022-06-02 15:06:58 +08:00
曹前明 defcb4aa7f 详情接口 2022-06-02 14:21:02 +08:00
曹前明 284fdcc114 增加返回信息,操作删除权限 2022-06-02 14:14:57 +08:00
曹前明 c54f3842fa 增加返回信息,操作删除权限 2022-06-02 14:13:27 +08:00
曹前明 e7321aa0ce 增加返回信息,操作删除权限 2022-06-02 14:09:42 +08:00
曹前明 48cd7affe3 报送操作确认不可删除 2022-06-02 08:56:36 +08:00
曹前明 d96aaa4491 qaction create 权限 2022-06-01 14:03:38 +08:00
曹前明 99bce06fb9 查询参数 2022-06-01 13:50:50 +08:00
曹前明 54eaa83846 服务查询bug 2022-06-01 13:43:17 +08:00
曹前明 415f3e68c6 bug修改 2022-06-01 11:35:04 +08:00
曹前明 84c3991b1f bug修改 2022-06-01 11:14:42 +08:00
曹前明 8d6d63ccfe bug修改 2022-05-31 16:46:54 +08:00
曹前明 70bd6492df city查询参数 2022-05-31 16:43:24 +08:00
曹前明 cfa91f4684 city查询参数 2022-05-31 16:37:52 +08:00
曹前明 a9658b0f55 省市数据 2022-05-30 16:08:43 +08:00
曹前明 bc7964474a 资质缓存 2022-05-19 11:47:50 +08:00
曹前明 b5e961bc64 接口测试完毕 2022-05-19 09:59:16 +08:00
曹前明 d68418d23c pageoff bug 2022-05-18 17:58:50 +08:00
曹前明 a48c4204a9 province city url 2022-05-18 17:52:06 +08:00
曹前明 32c7d19c82 qtask url 2022-05-18 17:01:52 +08:00
曹前明 6d3a226902 drf-yasg 2022-05-16 15:54:14 +08:00
曹前明 019a001776 增加swagger 2022-05-16 15:50:48 +08:00
曹前明 b70aa5131c 修改settings.py 2022-05-16 14:41:42 +08:00
曹前明 6800376519 资质报送后端接口 2022-05-16 12:35:02 +08:00
caoqianming d36fea5023 视频观看记录更新错误 2022-05-08 10:08:55 +08:00
caoqianming adc1e54ab7 更新视频观看信息bug 2022-04-21 10:10:30 +08:00
caoqianming 57d91c4873 增加videoupdateserializer 2022-04-21 09:06:22 +08:00
caoqianming 269f78d9a1 bug修改 2022-04-21 08:57:15 +08:00
caoqianming 7c2a5f78b3 vode 增加排序字段 按catory多层级筛选 2022-04-20 16:30:33 +08:00
caoqianming 6535ad167d code play bug 2022-04-14 14:32:56 +08:00
caoqianming 43863ee2d1 get play code 增加expireTimeStamp 2022-04-14 14:22:26 +08:00
caoqianming 7766afa1b6 playcode bug 2022-04-14 10:33:34 +08:00
caoqianming 0df96ee74c 获取签名不用try 2022-04-14 10:31:17 +08:00
caoqianming fd2af58c8e 修改bug 2022-04-14 08:32:40 +08:00
caoqianming 531a44daa1 生成播放签名 2022-04-14 08:29:50 +08:00