Commit Graph
2058 Commits
Author SHA1 Message Date
yuezhihang 76c7769625 国内,当实施日期大于发布日期时,要在首页的标准发布显示,目前实施日期为单个日期时,没问题,当实施日期为多个且都大于发布日期时,应该也在首页的标准发布显示,目前不显示 2022-03-15 10:01:05 +08:00
yuezhihang fa2bb29f1a 标准预警-导出,将发布日期导出放到一行显示 2022-03-14 18:19:25 +08:00
yuezhihang fd1cbe8a79 海外-查看-更新消息,清单由是改为否的时候,清单记录的2 2022-03-14 17:08:23 +08:00
yuezhihang bbe8114507 首页-标准发布,把文本状态为即将实施的逻辑去掉,只遵循标准发布大于系统日期小于实施日期,才能在首页显示 2022-03-14 14:17:14 +08:00
庄新伟 af846f74e0 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-03-14 09:30:10 +08:00
庄新伟 bae566fd1f 工作组导入导出 2022-03-14 09:29:55 +08:00
yuezhihang 0d4bc28382 3-11 bug 修复 2022-03-11 18:10:27 +08:00
yuezhihang 2d95a7c31f bug修复 2022-03-11 11:29:59 +08:00
super_liu 334dfb40f4 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, eeeeeeeeeeeeeeeeees

See merge request LiuChao/foton-slrs-system-rest!417
2022-03-08 20:16:38 +08:00
super_liu 26f5bdaff1 feat: There is no way the, eeeeeeeeeeeeeeeeees 2022-03-08 20:15:19 +08:00
super_liu 7b7cfcf476 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,

See merge request LiuChao/foton-slrs-system-rest!416
2022-03-08 17:48:57 +08:00
super_liu 50039d0295 feat: There is no way the, 2022-03-08 17:48:12 +08:00
yuezhihang 02611b3e04 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-03-08 17:12:55 +08:00
yuezhihang f161b0c0e0 测试接口 开放 2022-03-08 17:12:49 +08:00
super_liu 42be7a4c22 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 提提提提

See merge request LiuChao/foton-slrs-system-rest!415
2022-03-08 17:02:05 +08:00
super_liu b12a559e02 feat: There is no way the, 提提提提 2022-03-08 17:01:28 +08:00
yuezhihang 0543bdc57b Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-03-08 16:47:00 +08:00
yuezhihang 26fbf9daf3 导入修改 2022-03-08 16:46:56 +08:00
super_liu 230e035424 Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the, 跑跑跑 跑数据 重置es

See merge request LiuChao/foton-slrs-system-rest!414
2022-03-08 16:36:54 +08:00
super_liu c1eeea3f1f feat: There is no way the, 跑跑跑 跑数据 重置es 2022-03-08 16:33:33 +08:00
庄新伟 5f055e2152 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-03-08 16:24:12 +08:00
庄新伟 e43c86e894 工作组导入导出 2022-03-08 16:24:05 +08:00
yuezhihang ceda65e29e Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-03-08 15:48:55 +08:00
yuezhihang 81ef7787e8 三个测试接口 2022-03-08 15:48:44 +08:00
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