FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,745 Commits 1 Branch 0 Tags
dev_20231201_feizhi
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
gaojiabao cd915554b7 pdf在线编辑区分 2023-07-14 09:54:48 +08:00
gaojiabao a7c56cc8a2 Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613 2023-07-14 09:52:44 +08:00
gaojiabao 774dcb254d 在线编辑文件必须走在线编辑的pdf转换 2023-07-14 09:32:50 +08:00
gaojiabao 0e2fa19b59 Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613 2023-07-06 09:59:55 +08:00
gaojiabao 42441795d4 发布稿文件转换 在线编辑与非在线编辑 2023-07-06 09:59:22 +08:00
gaojiabao 0e12cf0ad4 文件地址修改 2023-06-21 15:04:39 +08:00
gaojiabao 83da5397a4 Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613 2023-06-21 10:59:20 +08:00
gaojiabao d5ca38a671 路径处理 2023-06-21 10:58:14 +08:00
gaojiabao ee5def33a4 在线编辑添加日志信息 2023-06-21 10:42:43 +08:00
gaojiabao 5c5233155a 文件下载乱码 2023-06-20 16:34:00 +08:00
gaojiabao c5c75fa1bd Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613 2023-06-20 13:24:15 +08:00
gaojiabao 896e1a6448 在线编辑文件无法被有效区分 2023-06-20 13:24:02 +08:00
gaojiabao 24d44f8eef 数组越位异常 2023-06-20 10:47:43 +08:00
gaojiabao 853e86279a Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613 2023-06-19 16:24:35 +08:00
gaojiabao 9eb859c6c4 企标修改空指针问题 2023-06-19 16:23:56 +08:00
gaojiabao 579b54d2be 39测试 2023-06-19 14:45:43 +08:00
gaojiabao 3a523968c9 文件处理测试 2023-06-19 14:26:17 +08:00
gaojiabao d584481550 Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613 2023-06-19 13:45:15 +08:00
gaojiabao 11c1a29710 39 测试调用在线编辑文件获取 2023-06-19 13:43:48 +08:00
gaojiabao 1ffad40423 Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613 2023-06-16 17:49:15 +08:00
gaojiabao 078dfef0bf 条件导出 2023-06-16 17:48:26 +08:00
gaojiabao c8d0cf9a76 企业标准条件查询导出 2023-06-16 17:03:03 +08:00
gaojiabao e535793bde mq批量文件pdf+导出全部功能 2023-06-16 16:38:33 +08:00
gaojiabao ede83fe43e 39 测试 2023-06-16 13:49:20 +08:00
gaojiabao 573890103f 39 测试 2023-06-15 15:31:13 +08:00
gaojiabao 76b2eea8f2 Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613 2023-06-15 15:05:33 +08:00
gaojiabao 61c5225319 39 测试 2023-06-15 15:04:57 +08:00
gaojiabao 12b642f0a8 退回pdf 2023-06-15 09:22:22 +08:00
gaojiabao 5985b060a8 Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-06-14 15:57:41 +08:00
gaojiabao a67f4a1ce4 pdf转换（样式） 2023-06-14 15:57:20 +08:00
gaojiabao d37ae382b5 Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-06-13 15:31:55 +08:00
gaojiabao f6f6146c83 拆分 2023-06-13 11:02:21 +08:00
gaojiabao 1bd71cc2c4 Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-06-12 14:05:02 +08:00
gaojiabao dd3692dd92 复审流程发送待办通知定时任务测试接口 2023-06-12 14:04:45 +08:00
gaojiabao 9ba9956769 文件问题优化 2023-06-07 11:41:53 +08:00
gaojiabao c163d54dc3 Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-06-06 16:57:36 +08:00
gaojiabao 0c8ff6d181 文件字体处理 2023-06-06 16:57:18 +08:00
gaojiabao 9daee78db4 Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-06-02 17:09:28 +08:00
gaojiabao 4d2604aea5 代码优化 处女转pdf 权限问题 2023-06-02 17:04:13 +08:00
gaojiabao b4d0eab10e 代码优化 2023-06-02 11:21:32 +08:00
gaojiabao 87c0e43dd1 代码优化 2023-06-02 09:54:08 +08:00
gaojiabao 08b16ff16b 优化 2023-06-01 17:20:19 +08:00
gaojiabao 1f7cd1625c Merge branch 'dev_20230216' of E:\futianxiangmu\foton-slrs-system-rest with conflicts. 2023-06-01 16:56:55 +08:00
gaojiabao 157b967451 Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-06-01 16:54:46 +08:00
gaojiabao fb92e09a5e 在线编辑pdf版本 2023-06-01 15:30:20 +08:00
gaojiabao b97a30b2c2 在线编辑 在线编辑文件转换失败则在标准详情时 重新加入Mq 2023-05-31 15:06:57 +08:00
gaojiabao 8514dddb38 在线编辑 his文件转换 2023-05-30 16:05:14 +08:00
gaojiabao 237af41edb 在线编辑 发布节点 进行转换 2023-05-30 16:03:08 +08:00
gaojiabao 407bf0f7ed Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-05-29 17:57:21 +08:00
gaojiabao ebf7821043 es 更新 2023-05-29 17:56:54 +08:00
gaojiabao d2ba2efd37 加密转换 失败则二次转换 2023-05-26 11:40:28 +08:00
gaojiabao 4a405b9f33 上传文件 加密 不能打开问题 修改MQ 2023-05-26 10:25:13 +08:00
gaojiabao 617d6f81c4 代码优化 2023-05-23 14:04:22 +08:00
gaojiabao a6c94c1c52 在线编辑文件 在国内 海外 企业 的编辑中进行回显 2023-05-23 14:02:24 +08:00
gaojiabao 65e3ad0007 文件名称修改 2023-05-22 20:47:14 +08:00
gaojiabao 71a1e49506 文件名称修改 2023-05-22 19:02:10 +08:00
gaojiabao aba2536836 在线编辑 文件日志更新 2023-05-22 15:58:18 +08:00
gaojiabao 9c89beda63 企标计划 发起流程添加 编号 年份 类别 2023-05-19 17:49:30 +08:00
gaojiabao 98bae18dfd 优化重复的白名单 2023-05-19 17:12:35 +08:00
gaojiabao 922b2d017d Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-05-19 16:41:09 +08:00
gaojiabao a45de04e11 优化在线编辑日志代码 2023-05-19 16:40:50 +08:00
gaojiabao 8069309683 在线编辑日志 白名单 2023-05-19 09:52:20 +08:00
gaojiabao 952ca708b6 Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-05-18 17:39:09 +08:00
gaojiabao 3bd5858f50 配置文件替换 es失效问题 2023-05-18 17:19:16 +08:00
gaojiabao c3df9d0345 替换 2023-05-18 15:40:37 +08:00
gaojiabao f42ae9764c Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-05-18 15:39:10 +08:00
gaojiabao aeb34d7c9d 在线编辑日志记录 测试 2023-05-18 15:37:31 +08:00
gaojiabao df32258aa4 拆分删除异常问题处理 2023-05-17 16:45:22 +08:00
gaojiabao 4a6794ec9f 配置文件修改 数据库 GTM+8问题 时间为中国时区 2023-05-16 17:37:05 +08:00
gaojiabao 2e8471050c Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-05-16 15:06:09 +08:00
gaojiabao b418feda13 企标置修订立项计划 导入起草 2023-05-16 15:05:57 +08:00
gaojiabao c649f1f208 拆分 引用标准 条件查询 单独处理 2023-05-16 11:39:22 +08:00
gaojiabao e35fd3a93d 废止流程即使生效 2023-05-16 10:07:24 +08:00
gaojiabao d7754c7ca7 国内海外 配置标准修正 2023-05-15 17:35:37 +08:00
gaojiabao 57b3f33610 流程 数组越位 2023-05-15 17:27:59 +08:00
gaojiabao 1352111b2f 制修订 更名 删除过才发起 没删除过不发起 2023-05-15 16:27:28 +08:00
gaojiabao de34688afc 待办 任务与 首页待办冲突问题处理 2023-05-15 14:54:40 +08:00
gaojiabao 717d1b7b06 企标计划sql 2023-05-12 18:18:33 +08:00
gaojiabao 7a9ad5d8aa 定时任务更正 2023-05-12 17:10:53 +08:00
gaojiabao d23a712d1e 企标制修订立项计划 下载模板 更新 2023-05-12 16:49:33 +08:00
gaojiabao 75be6c54cc 排序 仅排序数字 不排序文字 2023-05-12 15:53:25 +08:00
gaojiabao bee98af01c 国内海外新增没有目录问题 2023-05-12 14:33:28 +08:00
gaojiabao 1b1389f236 企标制修订bug问题处理 即删除待办 2023-05-12 13:14:49 +08:00
gaojiabao 1ea4f820da 首页 待办任务 2023-05-11 20:00:47 +08:00
gaojiabao 352487548a 标准拆分对比 名称搜索 2023-05-11 19:07:52 +08:00
gaojiabao ba33586bac 工作流 企标计划 删除待办问题 2023-05-11 17:11:58 +08:00
gaojiabao 9c5a7ce714 废止流程 立即修改 废止状态 2023-05-11 15:12:49 +08:00
gaojiabao 42715723c7 Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-05-11 13:47:58 +08:00
gaojiabao fa40a4c76c 企标计划删除的同时 企标复审计划中一并删除 2023-05-10 13:34:49 +08:00
gaojiabao fc82723eee 添加日志 + 接口记录 2023-05-05 10:16:29 +08:00
gaojiabao 083f3064fb 文件名称包含 中 cn/CN 译 的海外文件 放置译文 2023-05-05 10:12:18 +08:00
gaojiabao ebe79f127b 工作流 复审 标准类别搜索 2023-04-28 14:33:11 +08:00
gaojiabao 06f7ae6e90 工作流 复审 标准类别搜索 2023-04-28 14:15:56 +08:00
gaojiabao 2e19db8cc8 在线编辑 跨域 走主服务 测试 2023-04-28 11:43:29 +08:00
gaojiabao e96e57848f Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-04-27 17:12:52 +08:00
gaojiabao 25b9e9fc8e 跨越 经过主服务 在线编辑 2023-04-27 17:12:35 +08:00
gaojiabao 6edeff7666 定时任务 无效则不进入 2023-04-25 19:24:30 +08:00
gaojiabao 38fdc1e3a0 Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 2023-04-25 18:31:14 +08:00
gaojiabao bc3998172d 定时任务 复审 企业标准 查询 更正为每天凌晨执行 2023-04-25 18:31:01 +08:00
gaojiabao 64e8f0ef71 工作流 复审 标准类别搜索 企业标准 复审 2023-04-25 15:19:58 +08:00