FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,022 Commits 1 Branch 0 Tags
deab88a7cd24abd414293f779fb837d02fc93f22
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
yuezhihang 7c271fa204 数据字典查询接口优化 2022-02-22 12:36:28 +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
yuezhihang 697f5722eb 日志模块 查询对象修改 2022-02-18 16:52:21 +08:00
yuezhihang 83ae8a029a 根据角色 查询用户 2022-02-18 16:50:04 +08:00
yuezhihang 278985f338 标准合规评估查询条件 精确变模糊 2022-02-17 19:01:48 +08:00
yuezhihang 0c282f3e4b Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-02-17 17:36:37 +08:00
yuezhihang 57a770254c Merge remote-tracking branch 'origin/FOTON' into develop_master 2022-02-17 17:36:28 +08:00
yuezhihang 03e4f956d1 操作日志日期倒序 2022-02-17 17:14:25 +08:00
yuezhihang 584daa94b5 基础库 操作日志添加 2022-02-17 17:13:09 +08:00
yuezhihang 3459fa04aa 国内库查询日志 2022-02-17 14:03:40 +08:00
yuezhihang 31171e2580 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-02-16 16:07:49 +08:00
yuezhihang 5206fe004b 接口上加注解EpcLog 并加备注 可存储操作日志 2022-02-16 16:07:40 +08:00
yuezhihang b985a9933b 完成任务接口并更新草稿 2022-02-07 15:15:18 +08:00
yuezhihang 9951bd55fd Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-02-07 09:32:32 +08:00
yuezhihang add013d55e Merge remote-tracking branch 'origin/develop_3' into develop_master 2022-01-27 19:08:55 +08:00
yuezhihang 4f6926ddf7 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-01-27 09:36:03 +08:00
yuezhihang e9ddea77da Merge remote-tracking branch 'origin/develop_3' into develop_master 2022-01-27 09:34:43 +08:00
yuezhihang bd2b70930f Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-01-26 20:38:02 +08:00
yuezhihang b1ecd09547 分解单查询接口 标准评估流程用 2022-01-26 20:37:55 +08:00
yuezhihang 3c295a6e3e Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-01-24 22:22:39 +08:00
yuezhihang d2dfa6b2b0 标准合规评估查询条件 以及征求意见流程内导出 新增字段 2022-01-24 22:22:33 +08:00
yuezhihang 5d0df6d02c 机构管理最新需求 2022-01-21 18:54:21 +08:00
yuezhihang 12ad84d7d6 标准合规评估流程 新改动 2022-01-21 15:49:21 +08:00
yuezhihang 278e6d05bb Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-01-21 14:48:10 +08:00
yuezhihang 5f9f162535 标准合规评估流程的查询接口 2022-01-21 14:48:00 +08:00
yuezhihang d86f1c12cd 标准合规评估 2022-01-20 16:21:09 +08:00
yuezhihang 888240c86c 流程准备的接口 2022-01-20 15:20:41 +08:00
yuezhihang 4826332deb 标准合规评估 准备的接口 2022-01-20 15:05:23 +08:00
yuezhihang 5f6394975a Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-01-19 18:23:17 +08:00
yuezhihang a2b38c85d3 调研接口修复 2022-01-19 18:23:10 +08:00
yuezhihang 4821c6c34b 导出去html标签 2022-01-19 16:47:43 +08:00
yuezhihang 07ce4f1866 流程新需求 2022-01-19 16:27:39 +08:00
yuezhihang 087f629216 清单 问题修复 2022-01-17 17:00:26 +08:00
yuezhihang 4a4b99ad1c Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-01-17 16:37:42 +08:00
yuezhihang c2ddb5a92b 清单 新增和修改部分 对标准库的反打 2022-01-17 16:37:35 +08:00
yuezhihang 70d8ba058b 项目评估流程 -- 去重 2022-01-14 11:31:05 +08:00
yuezhihang 509905195a 回滚 2022-01-14 10:59:40 +08:00
yuezhihang bfa6f94452 项目评估结果去重 2022-01-14 10:44:30 +08:00
yuezhihang 07066ea00d 条款比对信息查询 2022-01-13 16:20:55 +08:00
yuezhihang 97519f1813 解读合并之后数据消失bug修复 以及会后流程自动发起 恢复到每天十点 2022-01-12 15:57:50 +08:00
yuezhihang 7f44d04f0f Merge remote-tracking branch 'origin/develop_3' into develop_master 2022-01-12 11:44:48 +08:00
yuezhihang 4c13ee7c1d 日期bug修复 2022-01-12 11:19:02 +08:00
yuezhihang d93e9fb2ba 征求意见bug修复 2022-01-12 11:00:25 +08:00
yuezhihang e70b85bbd7 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-01-12 10:20:42 +08:00
yuezhihang fed0b3dc85 公开征求意见 导出 bug修复 2022-01-12 10:20:28 +08:00
yuezhihang 654e7e8127 征求意见流程自动发起日期加一天问题修复 2022-01-11 15:35:59 +08:00
yuezhihang b26de7b09b 会议信息修改bug修复 2022-01-11 14:12:30 +08:00
yuezhihang dc57f4c58f Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-01-11 14:05:08 +08:00
yuezhihang b4d36e8888 会议信息修改bug修复 2022-01-11 14:05:00 +08:00
yuezhihang 914d2c3d06 测试会后流程 一小时发起一次 2022-01-11 11:08:14 +08:00
yuezhihang bf0d4c2106 公开征求意见导出修改 2022-01-11 10:14:35 +08:00
yuezhihang dc5f63fdb5 公开征求意见导出 修复 2022-01-10 18:25:55 +08:00
yuezhihang 596528bcbf 公开征求意见模块导出上报意见功能 修复 2022-01-10 18:10:09 +08:00
yuezhihang fbde67fd7f 征求意见流程内部导出 bug修复 2022-01-10 17:27:09 +08:00
yuezhihang 5f67b22e7c 条款比对出现比对完成状态 2022-01-07 17:16:32 +08:00
yuezhihang 0de45b8b35 Merge remote-tracking branch 'origin/develop_master' into develop_master 2022-01-07 16:22:05 +08:00
yuezhihang 6a4b807ecb 日期注解不生效问题 角色列表 差八小时 修复 2022-01-07 16:21:58 +08:00
yuezhihang 935cdf07ee 标准比对审核中状态出现 bug修复 --》已不出现 2022-01-07 14:58:14 +08:00