Commit Graph
1984 Commits
Author SHA1 Message Date
super_liu 88809e05d4 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, xxx

See merge request LiuChao/foton-slrs-system-rest!413
2022-03-07 17:57:09 +08:00
super_liu f1ac00a8dc feat: There is no way the, xxx 2022-03-07 17:56:17 +08:00
super_liu 7dc6dd7b74 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, HHH

See merge request LiuChao/foton-slrs-system-rest!412
2022-03-07 17:46:00 +08:00
super_liu 7e2f0ffe85 feat: There is no way the, HHH 2022-03-07 17:45:03 +08:00
super_liu 73c31e34b2 Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!411
2022-03-07 17:34:18 +08:00
super_liu 69c2d4c6e2 feat: There is no way the, 重置ES 2022-03-07 17:33:25 +08:00
yuezhihang 262ed6f777 数据字典 根据累类型 查询字典数据 未测试 2022-03-07 17:10:45 +08:00
yuezhihang 43ef09221d 数据字典查询接口 多加一个根据key查询 2022-03-07 17:05:11 +08:00
super_liu 291ade6b35 feat: There is no way the, 企标标准关联表更新关联ID字段长度SQL文件 2022-03-07 16:49:27 +08:00
yuezhihang bf5908d27a 导入公共方法修改 2022-03-07 16:28:21 +08:00
yuezhihang dd53ddd73c Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-03-07 15:44:53 +08:00
yuezhihang d06dbade9b bug 修复 2022-03-07 15:44:44 +08:00
super_liu d44a2b6bf0 feat: There is no way the, 重置ES 2022-03-07 15:16:47 +08:00
super_liu 615db4e9eb feat: There is no way the, 重置ES 2022-03-07 13:20:31 +08:00
super_liu f85569c4bc feat: There is no way the, 删掉无效的引用 无法打包 2022-03-07 09:30:52 +08:00
yuezhihang de50ae5d55 项目清单!!!!!!! 2022-03-04 15:22:40 +08:00
yuezhihang 152c49ce02 项目清单 查询修改 2022-03-04 10:46:20 +08:00
yuezhihang ea3ad20b56 导出工具bug修复 委员信息数据统计 导出带数据 2022-03-03 17:53:07 +08:00
yuezhihang aeb78eb36d Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-03-03 17:23:43 +08:00
yuezhihang bcadf21d75 协会信息数据统计 导入导出 以及 导入公共方法完善 2022-03-03 17:23:35 +08:00
super_liu ae26e35d3f Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 企标审批完入库后,入库人应为流程发起人

See merge request LiuChao/foton-slrs-system-rest!410
2022-03-03 16:08:21 +08:00
super_liu 13b603b526 feat: There is no way the, 企标审批完入库后,入库人应为流程发起人 2022-03-03 15:58:09 +08:00
yuezhihang b9e440c92c 后端通用生成excel 以及 协会信息数据统计带数据导出 2022-03-03 15:26:42 +08:00
yuezhihang 48a0181942 评估结果 排序 2022-03-02 17:39:09 +08:00
yuezhihang 230d0eab32 项目合规评估 --- 查询条件 新增 2022-03-02 16:52:31 +08:00
yuezhihang d2fd93450e 公用导出奥利给 只负责生成数据不负责校验 2022-03-02 16:41:43 +08:00
yuezhihang 4d7d5ddd0d 组织架构 2022-03-02 11:13:52 +08:00
yuezhihang 3c03a1659f 流程 批量导入数据 2022-03-01 18:01:13 +08:00
yuezhihang 9921c6aa9b Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-03-01 14:45:39 +08:00
yuezhihang dbaf142f03 bug修复==》 表单内 3.1 和 部分3.2 bug修复 2022-03-01 14:45:32 +08:00
super_liu 1bec67965b Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 水印加深0.1

See merge request LiuChao/foton-slrs-system-rest!409
2022-03-01 13:50:08 +08:00
super_liu bfd01ac605 feat: There is no way the, 水印加深0.1 2022-03-01 13:48:44 +08:00
yuezhihang 5316e6aeb3 282 bug 修复 2022-02-28 16:08:40 +08:00
yuezhihang f2269904cd 流程 的 模板下载 和 excel 282 行 姓名支持拼音查询的bug修复 2022-02-28 16:06:35 +08:00
yuezhihang 7262b6974b Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-02-24 17:55:28 +08:00
yuezhihang af11a626df bug修复 2022-02-24 17:55:22 +08:00
super_liu c0a967e125 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 国外被代替标准号 注掉 之前逻辑

See merge request LiuChao/foton-slrs-system-rest!408
2022-02-24 17:04:34 +08:00
super_liu aaae03989b feat: There is no way the, 国外被代替标准号 注掉 之前逻辑 2022-02-24 17:02:06 +08:00
super_liu 95a80b832c Merge branch 'develop_migration' into 'develop_master'
Develop migration

See merge request LiuChao/foton-slrs-system-rest!407
2022-02-24 13:54:37 +08:00
super_liu 86e74d5539 feat: There is no way the, 被代替标准自动生成 及 详情显示 2022-02-24 13:52:52 +08:00
super_liu 76a487e857 feat: There is no way the, 月末 (逻辑和 月初 一样 月末需跑一次下整月 防止特殊原因导致遗漏) 2022-02-24 10:46:56 +08:00
super_liu 287c909d25 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 企标复审计划月初逻辑 改为 下整月

See merge request LiuChao/foton-slrs-system-rest!406
2022-02-23 09:08:39 +08:00
super_liu 85e90b378d feat: There is no way the, 企标复审计划月初逻辑 改为 下整月 2022-02-23 09:05:59 +08:00
super_liu fea30dc871 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, tree async

See merge request LiuChao/foton-slrs-system-rest!405
2022-02-22 17:21:21 +08:00
super_liu 183ba86528 feat: There is no way the, tree async 2022-02-22 17:18:18 +08:00
yuezhihang 7c271fa204 数据字典查询接口优化 2022-02-22 12:36:28 +08:00
super_liu 8fa99c5b30 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, buss tree auth

See merge request LiuChao/foton-slrs-system-rest!404
2022-02-21 17:48:33 +08:00
super_liu 5352684945 feat: There is no way the, buss tree auth 2022-02-21 17:44:29 +08:00
yuezhihang c705648e3f Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-02-21 16:43:35 +08:00
yuezhihang 41dbca2772 项目合规评估 入库 操作 2022-02-21 16:43:29 +08:00