FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,333 Commits 1 Branch 0 Tags
51cf519e1ea1b68b6b2edf899352106101e59f3f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
yuezhihang adce797902 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-05-07 16:29:26 +08:00
yuezhihang e01952afc2 定时任务 根据时间更新 文本状态 2022-05-07 16:29:10 +08:00
yuezhihang b02e61a6c5 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-05-05 15:30:52 +08:00
yuezhihang e222598ce3 全局搜索 2022-05-05 15:30:43 +08:00
yuezhihang f38b96fc92 查询数据的时候增加 sort判断条件避免数据重复展示 2022-05-05 13:45:02 +08:00
yuezhihang 524c91a7f9 数据同步 2022-04-29 15:54:25 +08:00
yuezhihang 9f0e753206 数据 2022-04-29 15:39:49 +08:00
yuezhihang 3f20e9cc17 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-04-29 15:33:41 +08:00
yuezhihang 3727fe5bc8 数据更正 2022-04-29 15:33:32 +08:00
yuezhihang 14f67dda61 数据同步接口 不走es 2022-04-29 14:42:32 +08:00
yuezhihang 44ed3af251 清单导入 2022-04-27 19:11:16 +08:00
yuezhihang 41b19d1481 清单 导入 接口 修改 2022-04-27 13:42:33 +08:00
yuezhihang 0acb645cda 清单修改接口 反向映射到标准里 2022-04-27 11:04:50 +08:00
yuezhihang 6ce44b4f76 国家地区清单新增逻辑bug修复 2022-04-25 16:06:22 +08:00
yuezhihang f1e30c3fd5 bug 52667 修复 2022-04-25 13:31:35 +08:00
yuezhihang 3c17e7bcc4 bug 52666 解决 2022-04-24 15:04:03 +08:00
yuezhihang 95ad97c47b Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-04-22 17:18:43 +08:00
yuezhihang d5ac4d8f5c 导入 2022-04-22 17:18:35 +08:00
yuezhihang 07eebff61d 清单修改 2022-04-22 15:04:48 +08:00
yuezhihang fb7040d53b 清单修改 使用mq 2022-04-21 16:32:44 +08:00
yuezhihang 51010172f0 国内海外清单 标准的导入导出 2022-04-21 13:13:53 +08:00
yuezhihang 0907a79dbc 新增人员登录日志 2022-04-19 14:41:03 +08:00
yuezhihang 23b6b1e44c 未符合项 查询空格问题修复 2022-04-19 13:49:57 +08:00
yuezhihang 9bcead777b 标准比对 条款数据顺序问题 2022-04-15 10:37:15 +08:00
yuezhihang 3e4adf4368 去掉文本状态列 2022-04-14 16:45:33 +08:00
yuezhihang aab8023f1a 征求意见查询文本类型接口 完善 补充海外的字段（原逻辑只有国内字段） 2022-04-14 14:56:03 +08:00
yuezhihang d466d96b91 项目清单确认 字段返回值补充 2022-04-14 11:25:30 +08:00
yuezhihang 5a950b7faa 标准比对 以及产品规划部 批量关闭 加导出 2022-04-13 15:23:23 +08:00
yuezhihang f96714b0d2 4-12 审查流程入库页面展示 2022-04-12 17:40:20 +08:00
yuezhihang 9c0326c722 产品规划部 入库数据 2022-04-11 16:56:02 +08:00
yuezhihang f5f693863c 产品规划部审查结果查询 2022-04-11 16:27:00 +08:00
yuezhihang c22104afab 审查流程 2022-04-11 16:22:16 +08:00
yuezhihang 38ce2194c7 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-04-07 16:55:28 +08:00
yuezhihang 27b91f8e9b 选人组件 人咋选顺序咋显示 2022-04-07 16:55:08 +08:00
yuezhihang 6a21bd50e5 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-04-02 16:34:56 +08:00
yuezhihang 41deabd152 专门用来查询存在分解单数据的类型的接口 2022-04-02 16:34:47 +08:00
yuezhihang bcecefc39a 清单高级查询 2022-04-02 14:02:18 +08:00
yuezhihang 8860d789e4 清单部分高级查询 2022-04-02 11:26:09 +08:00
yuezhihang ee348fbc29 新增重点清单返参 2022-04-02 11:13:05 +08:00
yuezhihang 2b46243e7b Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-03-31 17:25:25 +08:00
yuezhihang adf4e92c94 企标制修订 立项 导入bug 2022-03-31 17:25:14 +08:00
yuezhihang 61d6bff12b 3-29 bug 修复 2022-03-30 09:02:19 +08:00
yuezhihang 845e23d76b 征求意见最新需求 2022-03-28 17:52:10 +08:00
yuezhihang a4099ee7eb 征求意见 日期判断 2022-03-28 16:59:44 +08:00
yuezhihang 6c6e7525fa Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-03-28 14:08:06 +08:00
yuezhihang a9d17700d2 企标导出 2022-03-28 14:07:52 +08:00
yuezhihang 1c73ac3e8a Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-03-24 16:41:08 +08:00
yuezhihang 0e3a67204d 标准入库流程 直接处理带入数据的回显项 --归档位置 2022-03-24 16:40:59 +08:00
yuezhihang 4ace839e1f 加了个部门的查询条件 2022-03-23 17:46:13 +08:00
yuezhihang 461caf2105 角色管理查看人员增加部门显示-后台代码 2022-03-23 17:40:11 +08:00
yuezhihang 9b2b957335 注解 2022-03-23 16:55:27 +08:00
yuezhihang 2ac8eda3be Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-03-23 16:54:30 +08:00
yuezhihang 890e6bc463 公共导入方法 新增校验模板功能 过滤excel纯空行数据功能 2022-03-23 16:54:24 +08:00
yuezhihang eaf00ffb34 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-03-23 15:32:03 +08:00
yuezhihang aefc5c72a5 清除公开征求意见 2022-03-23 15:31:56 +08:00
yuezhihang cee8fb564f 企标制修订计划导入 2022-03-23 10:23:41 +08:00
yuezhihang 87e36d5088 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-03-22 17:30:38 +08:00
yuezhihang 86b9eabd03 企标制修订计划立项-导入 修复 ，高级查询失效修复 2022-03-22 17:30:29 +08:00
yuezhihang dc585e7840 高级查询多日期只检索第一个 2022-03-21 09:47:44 +08:00
yuezhihang 47ebd2a685 bug修复 2022-03-19 15:19:19 +08:00
yuezhihang 86b618eac3 项目 同步数据----部分数据需要从已维护变为未维护 2022-03-19 14:48:54 +08:00
yuezhihang e257b13803 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-03-18 16:52:03 +08:00
yuezhihang 4b8f755b92 3-16 2022-03-18 16:51:48 +08:00
yuezhihang a6bef4be76 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-03-18 13:47:06 +08:00
yuezhihang 52b12d4438 ==判断企标权限接口 api/lawss/sarBussionessStand/checkIsShow 2022-03-18 13:46:59 +08:00
yuezhihang 9f667ecd51 高级查询 2022-03-17 17:26:16 +08:00
yuezhihang 52c238c02e 企业体系 2022-03-17 15:13:34 +08:00
yuezhihang 99c6771c96 3.17 处理体系结构数据接口 以及体系结构数据查询修改 2022-03-17 14:56:43 +08:00
yuezhihang deab88a7cd Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-03-16 18:21:05 +08:00
yuezhihang 23b81d878c 3-16 2022-03-16 18:20:57 +08:00
yuezhihang 496fb1da4d 海外-查看-更新消息，清单由是改为否的时候，清单记录的2 2022-03-15 17:24:24 +08:00
yuezhihang 4cab17227f 获取数据 2022-03-15 16:34:12 +08:00
yuezhihang 3ecfc336c8 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-03-15 16:32:59 +08:00
yuezhihang 7c57087964 公开征求意见 2022-03-15 16:32:54 +08:00
yuezhihang 6d43442da5 未符合项目排序问题 2022-03-15 16:30:43 +08:00
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
yuezhihang 0d4bc28382 3-11 bug 修复 2022-03-11 18:10:27 +08:00
yuezhihang 2d95a7c31f bug修复 2022-03-11 11:29:59 +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
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
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
yuezhihang 262ed6f777 数据字典 根据累类型 查询字典数据 未测试 2022-03-07 17:10:45 +08:00
yuezhihang 43ef09221d 数据字典查询接口 多加一个根据key查询 2022-03-07 17:05:11 +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
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
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