Commit Graph

  • 26905d00fb 项目确认添加适用认证 zhangjun 2022-09-22 20:36:00 +08:00
  • 45e2d9766f Merge branch 'develop_master' into FOTON zyd 2022-09-22 00:44:57 +08:00
  • 1de8e48996 fix: 更新带水印下载代码逻辑 zyd 2022-09-22 00:44:10 +08:00
  • 89f6240481 fix:优化机构查询用户速度慢的问题 zyd 2022-09-21 22:59:52 +08:00
  • 2cf172938d Merge branch 'develop_master' into FOTON zhangyanduan 2022-09-21 17:09:46 +08:00
  • ca3f48c207 add: 增加过滤忽略白名单 syncModelDto zhangyanduan 2022-09-21 17:08:43 +08:00
  • 1d83907924 add: 添加模块单元数据接收推送接口 zhangyanduan 2022-09-21 17:06:26 +08:00
  • 707b03aec2 Merge remote-tracking branch 'origin/develop_master' into FOTON zhangjun 2022-09-21 00:51:04 +08:00
  • 13c8fb50b0 查询接口 zhangjun 2022-09-21 00:50:32 +08:00
  • 0f3e60feb8 fix: 修复关联表查询速度慢的问题 zyd 2022-09-21 00:26:09 +08:00
  • 8a7673cd38 Merge remote-tracking branch 'origin/develop_master' into FOTON zhangjun 2022-09-20 23:00:57 +08:00
  • 3bd92a4fa2 优化机构 zhangjun 2022-09-20 22:55:54 +08:00
  • 386bcac55c Merge branch 'develop_master' into FOTON zyd 2022-09-19 07:40:12 +08:00
  • 7f3e07000c Merge remote-tracking branch 'origin/develop_master' into develop_master zhangjun 2022-09-16 10:27:19 +08:00
  • f4b3391a53 标准合规评估流程,项目分发节点,添加项目页面,项目经理没带出来 zhangjun 2022-09-16 10:27:08 +08:00
  • f47962e26c fix: 修复权限查询逻辑,并且提交最新的权限表数据字段内容 zyd 2022-09-16 00:20:44 +08:00
  • 1c7e92baf0 es查询大写 zhangjun 2022-09-15 15:54:21 +08:00
  • 499d4702ee 定时任务:预警 zhangjun 2022-09-14 18:12:28 +08:00
  • 317881c646 编辑时清空代替,被代替未删除对应标准 zhangjun 2022-09-14 16:28:15 +08:00
  • d05fbf64e7 ES大小写问题 zhangjun 2022-09-14 14:45:06 +08:00
  • ea3dcbc04e Merge branch 'develop_master' into FOTON DESKTOP-JNBCTEI\Edison 2022-09-08 22:09:03 +08:00
  • afdc003aa2 先跑项目评估流程,假如归档A标准,再跑标准评估流程,假如归档B标准,查看项目清单,对应项目下的A标准被替换了 zhangjun 2022-09-08 18:49:10 +08:00
  • d63ec599cc 项目评估流程完结之后,项目库归档有问题,符合,不涉及没有归档,合规评估模块归档没问题 zhangjun 2022-09-08 16:55:25 +08:00
  • 8b82bfac9f 修改查询除了非改项目下标准的数据 zhangjun 2022-09-08 13:25:17 +08:00
  • 83f36cc913 还原数据 zhangjun 2022-09-06 15:09:14 +08:00
  • 72d2d47c31 项目合规评估流程 草稿,返显数据 zhangjun 2022-09-06 15:03:04 +08:00
  • 19acf4b842 Merge remote-tracking branch 'origin/develop_master' into FOTON zhangjun 2022-09-05 21:29:08 +08:00
  • 3f616818b8 fix: 优化对比数据的对比差异内容的显示效果 zhangyanduan 2022-09-05 16:28:49 +08:00
  • 15593f2afc 项目确认清单,没有标准未传参 zhangjun 2022-09-05 11:14:19 +08:00
  • 6f49186f7f 修改定时任务 zhangjun 2022-09-02 11:14:23 +08:00
  • 04f10c6df9 修改定时任务 zhangjun 2022-09-02 10:20:49 +08:00
  • 7d06865f03 修改定时任务 zhangjun 2022-09-02 10:17:28 +08:00
  • b8f756a6fb 修改定时任务 zhangjun 2022-09-02 09:54:16 +08:00
  • 98278f1c37 Merge remote-tracking branch 'origin/develop_master' into develop_master zhangjun 2022-09-01 16:08:55 +08:00
  • 5b81a7e3e2 加字段并修改技术评估查询 zhangjun 2022-09-01 16:08:43 +08:00
  • 101fb1a063 fix: 修复项目清单更新流程中企标状态没有显示的BUG zhangyanduan 2022-09-01 14:13:49 +08:00
  • 8c14a17b35 导入修改 zhangjun 2022-09-01 10:10:40 +08:00
  • 17ad8a9992 导入空模板报错 zhangjun 2022-08-31 14:42:42 +08:00
  • bf349bb100 分页不生效 zhangjun 2022-08-31 13:54:05 +08:00
  • a80a136046 Merge remote-tracking branch 'origin/develop_master' into develop_master zhangjun 2022-08-31 12:22:21 +08:00
  • 96a818628d 按照顺序查询结果 zhangjun 2022-08-31 12:22:10 +08:00
  • 001a9287cf fix: 将线上版本的日志输出路径配置为当前jar包所在的路径 zyd 2022-08-31 01:27:09 +08:00
  • d75274ce53 Merge branch 'develop_master' into FOTON zyd 2022-08-31 01:05:37 +08:00
  • 206c1bccf3 add:机构管理增加根据部门批量配置岗位功能 zyd 2022-08-31 00:00:35 +08:00
  • 3db4903b0a add: 预警功能只预警最新文件类型的分解单 zyd 2022-08-30 22:56:24 +08:00
  • 460892ce48 查询,改回原状 zhangjun 2022-08-30 18:26:25 +08:00
  • b42a15ebda 按照顺序查询结果 zhangjun 2022-08-30 18:23:58 +08:00
  • 8b25587e77 Merge remote-tracking branch 'origin/develop_master' into FOTON zhangjun 2022-08-30 18:13:24 +08:00
  • c4f23a11ac 按照顺序查询结果 zhangjun 2022-08-30 18:11:58 +08:00
  • adddb5759e 按照顺序查询结果 zhangjun 2022-08-30 18:07:29 +08:00
  • 09fd662314 查询 zhangjun 2022-08-30 17:29:33 +08:00
  • eaec394e0a 查询 zhangjun 2022-08-30 17:21:48 +08:00
  • 01ca5fa835 Merge remote-tracking branch 'origin/develop_master' into FOTON zhangjun 2022-08-30 17:17:05 +08:00
  • 145ad2ac2d 需无权限的放在前面 zhangjun 2022-08-30 17:15:47 +08:00
  • e243dbb44f Merge remote-tracking branch 'origin/develop_master' into FOTON zhangjun 2022-08-30 13:58:00 +08:00
  • 3bff146fb4 还原es查询 + 修改定时任务 GB/T 没有同时更新 zhangjun 2022-08-29 12:13:53 +08:00
  • 3d3a515710 修改无更新记录 zhangjun 2022-08-26 21:16:17 +08:00
  • 43c8fea8b2 Merge remote-tracking branch 'origin/develop_master' into develop_master zhangjun 2022-08-26 15:21:24 +08:00
  • 4c7f086060 非 .keyword 无法查询出结果 zhangjun 2022-08-26 15:20:51 +08:00
  • ae466b86d7 Merge remote-tracking branch 'origin/FOTON' into FOTON zhangjun 2022-08-25 18:58:36 +08:00
  • 0276ca92aa Merge branch 'develop_master' into FOTON zhangyanduan 2022-08-25 18:58:06 +08:00
  • a0c44be519 Merge remote-tracking branch 'origin/develop_master' into FOTON zhangjun 2022-08-25 18:54:53 +08:00
  • 8c25f8fb73 56708 zhangjun 2022-08-23 10:14:05 +08:00
  • 075cd4768c fix:解决线上ES更新逻辑中获取文件ID时报错的BUG,目前看不到具体参数,此处增加错误输出,后续监测问题 zyd 2022-08-25 16:34:09 +08:00
  • 84c941612b fix: 修改文件名时,文件中包含.的时候导致文件名不对的BUG zhangyanduan 2022-08-25 16:07:39 +08:00
  • 122e639e79 57017 zhangjun 2022-08-25 12:41:25 +08:00
  • 6cd526e613 57017 zhangjun 2022-08-24 14:37:53 +08:00
  • ca4ef75fda 56874 zhangjun 2022-08-23 16:37:14 +08:00
  • 1687202ef5 56983 zhangjun 2022-08-23 14:19:32 +08:00
  • 819d937d72 56694 zhangjun 2022-08-23 13:46:28 +08:00
  • aa13451ac6 56708 zhangjun 2022-08-23 10:14:05 +08:00
  • 2a46d765c6 Merge branch 'develop_master' into FOTON 396572590@qq.com 2022-08-19 17:31:11 +08:00
  • 4017e27243 Merge branch 'develop_migration' into 'develop_master' super_liu 2022-08-19 17:29:49 +08:00
  • 9d4609e749 Merge branch 'develop_master' into develop_migration 396572590@qq.com 2022-08-19 17:28:57 +08:00
  • 2ef63ef875 feat: There is no way the, 自动更新状态 添加 更新LOG 396572590@qq.com 2022-08-19 17:26:46 +08:00
  • 405fa26217 Merge branch 'develop_master' into FOTON 396572590@qq.com 2022-08-19 10:02:10 +08:00
  • bc11581770 fix: 福田AWC系统对接接口中VPPS编码只识别到第三级 zhangyanduan 2022-08-18 13:40:58 +08:00
  • ce9736de6f Merge branch 'develop_migration' into 'develop_master' super_liu 2022-08-17 17:42:21 +08:00
  • 0005b8aa6e feat: There is no way the, 56994 分接单手动关联之后条款顺序不对 396572590@qq.com 2022-08-17 16:36:13 +08:00
  • 293f1f1471 feat: There is no way the, 56996 基础库的状态自动变更之后,没有log 396572590@qq.com 2022-08-17 16:25:54 +08:00
  • 65a4124615 Merge branch 'develop_migration' into 'develop_master' super_liu 2022-08-17 11:18:14 +08:00
  • f14a6f2c62 feat: There is no way the, 首页征求意见 查询 396572590@qq.com 2022-08-16 17:01:10 +08:00
  • 658d83e47e feat: There is no way the, 56968 引用标准1589跳转没改好 396572590@qq.com 2022-08-12 14:16:41 +08:00
  • 7896a28126 Merge branch 'develop_master' into FOTON 396572590@qq.com 2022-08-10 17:46:53 +08:00
  • dd1be531a5 Merge branch 'develop_migration' into 'develop_master' super_liu 2022-08-10 17:44:15 +08:00
  • fa4778b555 feat: There is no way the, 标准 被代替 补漏。。 详情点击代替、被代替标准效验接口修改 396572590@qq.com 2022-08-10 17:43:44 +08:00
  • 92eff43614 Merge branch 'develop_master' into FOTON 396572590@qq.com 2022-08-10 17:00:57 +08:00
  • 179bc9e1e1 Merge branch 'develop_migration' into 'develop_master' super_liu 2022-08-10 16:56:45 +08:00
  • c86440eb96 feat: There is no way the, 标准 被代替 补漏。。 详情点击代替、被代替标准效验接口修改 396572590@qq.com 2022-08-10 16:55:50 +08:00
  • f508297e35 Merge branch 'develop_migration' into 'develop_master' super_liu 2022-08-10 16:44:52 +08:00
  • 43c59e13e5 feat: There is no way the, 标准 被代替 补漏。。 详情点击代替、被代替标准效验接口修改 396572590@qq.com 2022-08-10 16:26:36 +08:00
  • abdff75209 fix: 修复查询人员时,组织机构层级等于3层时,获取的集合数量错误导致接口报错无法选择人的BUG zyd 2022-08-10 08:11:38 +08:00
  • 2cd8f5e5fe Merge branch 'develop_migration' into 'develop_master' super_liu 2022-08-08 17:36:34 +08:00
  • b792f585a4 feat: There is no way the, 396572590@qq.com 2022-08-08 16:49:23 +08:00
  • 96f8ee33b3 Merge branch 'develop_migration' into 'develop_master' super_liu 2022-08-04 16:11:38 +08:00
  • 67c4a1afd9 feat: There is no way the, 56904 问答库-订阅 程序异常 api/lawss/Subscription/insertSubscription 这个接口 , 添加 取消订阅功能 396572590@qq.com 2022-08-04 16:10:45 +08:00
  • 4e90dfa1cf feat: There is no way the, 56828 项目评估流程,选择项目页面,项目显示不全,只显示10条数据 396572590@qq.com 2022-08-04 13:25:37 +08:00
  • 2703768e23 Merge branch 'develop_migration' into 'develop_master' super_liu 2022-08-03 16:02:21 +08:00
  • aacd522b79 feat: There is no way the, 56881 标准拆分-详情-模板下载,token无效 , 添加白名单 396572590@qq.com 2022-08-03 15:50:00 +08:00
  • 0f8cb0b64e Merge branch 'develop_migration' into 'develop_master' super_liu 2022-08-02 18:02:36 +08:00