Commit Graph

  • a436780725 合并分支 'fix_foton_20230613' 到 'master' 高嵩 2023-07-06 15:57:04 +08:00
  • 0e2fa19b59 Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613 gaojiabao 2023-07-06 09:59:55 +08:00
  • 42441795d4 发布稿文件转换 在线编辑与非在线编辑 gaojiabao 2023-07-06 09:59:22 +08:00
  • d20f4a4f34 Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613 SUNJIABIN 2023-07-06 08:58:41 +08:00
  • d971014c09 取消每天00:01国内外和企业标准的被代替标准号的标准 SUNJIABIN 2023-07-06 08:58:23 +08:00
  • 8c677a7715 add:删除多余注释,添加定时任务日志打印 wxyclub 2023-07-05 17:17:49 +08:00
  • 5450f65e0d 合并分支 'fix_foton_20230613' 到 'master' 高嵩 2023-07-03 17:00:17 +08:00
  • cc6331f6a6 test:测试调用在线编辑文件获取 wxyclub 2023-07-03 16:55:31 +08:00
  • 3e328fefed 合并分支 'fix_foton_20230613' 到 'master' 高嵩 2023-06-29 17:07:58 +08:00
  • d33d1f769a test:测试调用在线编辑文件获取 wxyclub 2023-06-29 17:00:23 +08:00
  • f73bfdf8e2 指定下载文件的编码格式 SUNJIABIN 2023-06-21 15:48:16 +08:00
  • cafa94efbc Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613 SUNJIABIN 2023-06-21 15:26:04 +08:00
  • 607eb0fa0c 解决下载文件乱码问题 SUNJIABIN 2023-06-21 15:25:53 +08:00
  • 0e12cf0ad4 文件地址修改 gaojiabao 2023-06-21 15:04:39 +08:00
  • 394af4da38 合并分支 'fix_foton_20230613' 到 'master' 高嵩 2023-06-21 11:27:15 +08:00
  • 83da5397a4 Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613 gaojiabao 2023-06-21 10:59:20 +08:00
  • d5ca38a671 路径处理 gaojiabao 2023-06-21 10:58:14 +08:00
  • d0fcfe4f01 Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613 SUNJIABIN 2023-06-21 10:51:21 +08:00
  • 953c063ef5 解决下载文件乱码问题 SUNJIABIN 2023-06-21 10:51:13 +08:00
  • ee5def33a4 在线编辑添加日志信息 gaojiabao 2023-06-21 10:42:43 +08:00
  • d73c03e2ff 合并分支 'fix_foton_20230613' 到 'master' 高嵩 2023-06-20 16:38:43 +08:00
  • 5c5233155a 文件下载乱码 gaojiabao 2023-06-20 16:34:00 +08:00
  • fd759dba25 合并分支 'fix_foton_20230613' 到 'master' 高嵩 2023-06-20 14:38:06 +08:00
  • c5c75fa1bd Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613 gaojiabao 2023-06-20 13:24:15 +08:00
  • 896e1a6448 在线编辑文件无法被有效区分 gaojiabao 2023-06-20 13:24:02 +08:00
  • e4cdc7621b 新增同步es数据的定时任务 SUNJIABIN 2023-06-20 11:46:56 +08:00
  • 24d44f8eef 数组越位异常 gaojiabao 2023-06-20 10:47:43 +08:00
  • 93560af7e7 合并分支 'fix_foton_20230613' 到 'master' 高嵩 2023-06-19 17:19:03 +08:00
  • 853e86279a Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613 gaojiabao 2023-06-19 16:24:35 +08:00
  • 9eb859c6c4 企标修改空指针问题 gaojiabao 2023-06-19 16:23:56 +08:00
  • c204a21b12 Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613 wxyclub 2023-06-19 16:22:13 +08:00
  • c2b779c3c0 add:修改对外PDMC读取文件接口查询 wxyclub 2023-06-19 16:19:54 +08:00
  • 579b54d2be 39测试 gaojiabao 2023-06-19 14:45:43 +08:00
  • 3a523968c9 文件处理测试 gaojiabao 2023-06-19 14:26:17 +08:00
  • d584481550 Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613 gaojiabao 2023-06-19 13:45:15 +08:00
  • 11c1a29710 39 测试调用在线编辑文件获取 gaojiabao 2023-06-19 13:43:48 +08:00
  • 84c6ac5fd9 合并分支 'fix_foton_20230613' 到 'master' 高嵩 2023-06-19 12:46:05 +08:00
  • bb6ad10c5a 新增'企标发布节点完成任务和入库接口执行前先执行校验编号和名称校验'接口 SUNJIABIN 2023-06-19 09:54:18 +08:00
  • fecfd518d5 新增'企标发布节点完成任务和入库接口执行前先执行校验编号和名称校验'接口 SUNJIABIN 2023-06-19 09:15:34 +08:00
  • 4afc0a662e 合并分支 'fix_foton_20230613' 到 'master' 高嵩 2023-06-16 17:51:56 +08:00
  • 1ffad40423 Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613 gaojiabao 2023-06-16 17:49:15 +08:00
  • 078dfef0bf 条件导出 gaojiabao 2023-06-16 17:48:26 +08:00
  • a34c5ec7ac 合并分支 'fix_foton_20230613' 到 'master' 高嵩 2023-06-16 17:36:59 +08:00
  • 1a11394e5b 入库时校验优化 SUNJIABIN 2023-06-16 17:36:04 +08:00
  • b4bc81eb43 合并分支 'fix_foton_20230613' 到 'master' 高嵩 2023-06-16 17:07:36 +08:00
  • c8d0cf9a76 企业标准条件查询导出 gaojiabao 2023-06-16 17:03:03 +08:00
  • e535793bde mq批量文件pdf+导出全部功能 gaojiabao 2023-06-16 16:38:33 +08:00
  • ede83fe43e 39 测试 gaojiabao 2023-06-16 13:49:20 +08:00
  • 573890103f 39 测试 gaojiabao 2023-06-15 15:31:13 +08:00
  • 76b2eea8f2 Merge remote-tracking branch 'origin/fix_foton_20230613' into fix_foton_20230613 gaojiabao 2023-06-15 15:05:33 +08:00
  • 61c5225319 39 测试 gaojiabao 2023-06-15 15:04:57 +08:00
  • bf3998d8b7 合并分支 'fix_foton_20230613' 到 'master' 高嵩 2023-06-15 11:37:57 +08:00
  • 6411deb8a6 add:修改对外PDMC读取文件接口查询 wxyclub 2023-06-15 11:16:02 +08:00
  • 812d2533f0 合并分支 'dev_20230216' 到 'master' 高嵩 2023-06-15 09:24:05 +08:00
  • 12b642f0a8 退回pdf gaojiabao 2023-06-15 09:22:22 +08:00
  • 5985b060a8 Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 gaojiabao 2023-06-14 15:57:41 +08:00
  • a67f4a1ce4 pdf转换(样式) gaojiabao 2023-06-14 15:57:20 +08:00
  • 8690fcb35f 优化同步人员数据的定时任务 SUNJIABIN 2023-06-14 14:32:05 +08:00
  • b4870471c9 合并分支 'dev_20230216' 到 'master' 高嵩 2023-06-14 12:00:17 +08:00
  • 444f8e1345 修改拆分问题 高嵩 2023-06-13 20:12:53 +08:00
  • d37ae382b5 Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 gaojiabao 2023-06-13 15:31:55 +08:00
  • aab7a0fb4a 优化企标制定顺序号校验 SUNJIABIN 2023-06-13 14:15:27 +08:00
  • f6f6146c83 拆分 gaojiabao 2023-06-13 11:02:21 +08:00
  • 67106e61f6 合并分支 'dev_20230216' 到 'master' 高嵩 2023-06-12 17:50:15 +08:00
  • d24bdd6d28 Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 SUNJIABIN 2023-06-12 14:36:10 +08:00
  • efb8e69f02 手动全部删除es中的国内外和企标数据,慎用 SUNJIABIN 2023-06-12 14:35:58 +08:00
  • 1bd71cc2c4 Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 gaojiabao 2023-06-12 14:05:02 +08:00
  • dd3692dd92 复审流程发送待办通知定时任务测试接口 gaojiabao 2023-06-12 14:04:45 +08:00
  • b1df47a9b7 合并分支 'dev_20230216' 到 'master' 高嵩 2023-06-09 10:10:36 +08:00
  • 6325b8ef92 将es国内外执行删除的代码解开 SUNJIABIN 2023-06-09 09:16:23 +08:00
  • 76b1475302 优化企标入库时顺序号问题 SUNJIABIN 2023-06-08 10:23:05 +08:00
  • 2a6f73c7ef 合并分支 'dev_20230216' 到 'master' 高嵩 2023-06-07 16:38:55 +08:00
  • ad071e561e Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 SUNJIABIN 2023-06-07 14:33:42 +08:00
  • 3595afda47 修改修订入库时顺序号没有入库问题 SUNJIABIN 2023-06-07 14:33:19 +08:00
  • 9ba9956769 文件问题优化 gaojiabao 2023-06-07 11:41:53 +08:00
  • 1b98d48b0f 合并分支 'dev_20230216' 到 'master' 高嵩 2023-06-06 16:58:49 +08:00
  • c163d54dc3 Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 gaojiabao 2023-06-06 16:57:36 +08:00
  • 0c8ff6d181 文件字体处理 gaojiabao 2023-06-06 16:57:18 +08:00
  • be1fc9a7b2 增加流程发布时校验顺序号问题 SUNJIABIN 2023-06-06 15:51:25 +08:00
  • b7f7e952f2 增加流程发布时校验顺序号问题 SUNJIABIN 2023-06-06 11:33:36 +08:00
  • 38effa474b 合并分支 'dev_20230216' 到 'master' 高嵩 2023-06-06 11:32:36 +08:00
  • 9271f5aa81 测试线上定时任务是否好使了 SUNJIABIN 2023-06-06 09:55:37 +08:00
  • d5c3ea25a7 优化企标入库时对评分新增时的校验规则代码 SUNJIABIN 2023-06-05 10:13:16 +08:00
  • feb89361cd 合并分支 'dev_20230216' 到 'master' 高嵩 2023-06-02 17:20:17 +08:00
  • e92b94c213 Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 SUNJIABIN 2023-06-02 17:19:20 +08:00
  • 052b083ebb 修改企标入库时对评分新增时的校验规则 SUNJIABIN 2023-06-02 17:19:12 +08:00
  • 9daee78db4 Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 gaojiabao 2023-06-02 17:09:28 +08:00
  • 4d2604aea5 代码优化 处女转pdf 权限问题 gaojiabao 2023-06-02 17:04:13 +08:00
  • 859293ab7f 修改企标入库时对评分新增时的校验规则 SUNJIABIN 2023-06-02 16:49:18 +08:00
  • ab458ce073 将企业标准根据代替标准号修改文本状态的定时任务修改成每天早晨四点执行 SUNJIABIN 2023-06-02 16:05:08 +08:00
  • 57df454a60 合并分支 'dev_20230216' 到 'master' 高嵩 2023-06-02 11:50:51 +08:00
  • b4d0eab10e 代码优化 gaojiabao 2023-06-02 11:21:32 +08:00
  • 87c0e43dd1 代码优化 gaojiabao 2023-06-02 09:54:08 +08:00
  • 79ca2f228c 合并分支 'dev_20230216' 到 'master' 高嵩 2023-06-01 17:28:44 +08:00
  • 08b16ff16b 优化 gaojiabao 2023-06-01 17:20:19 +08:00
  • 78e9814921 合并分支 'dev_20230216' 到 'master' 高嵩 2023-06-01 16:58:38 +08:00
  • 1f7cd1625c Merge branch 'dev_20230216' of E:\futianxiangmu\foton-slrs-system-rest with conflicts. gaojiabao 2023-06-01 16:56:55 +08:00
  • 157b967451 Merge remote-tracking branch 'origin/dev_20230216' into dev_20230216 gaojiabao 2023-06-01 16:54:46 +08:00
  • fb92e09a5e 在线编辑pdf版本 gaojiabao 2023-06-01 15:30:20 +08:00
  • 8ddd359829 新增国内外和企业标准更新文本状态的定时任务 SUNJIABIN 2023-06-01 13:59:50 +08:00