FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,473 Commits 1 Branch 0 Tags
a642c5eaa53c18bdb60f2b5bce1ef8d814aa6b0a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
yuezhihang 14e2b3368c 拆分和ocr查询文件出错问题 2021-12-15 16:15:29 +08:00
yuezhihang 0a26dbfda9 工作组 2021-12-15 11:22:19 +08:00
yuezhihang 67deb52111 工作组下 关联属性删除1 2021-12-15 11:05:00 +08:00
yuezhihang ebd5c94057 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-15 10:14:52 +08:00
yuezhihang 99f33ac218 工作组 单位不回显bug修复 2021-12-15 10:14:45 +08:00
yuezhihang cae1605ab1 工作组修改完已经可以回显 2021-12-14 17:45:23 +08:00
yuezhihang a8fda1bb94 标准清单查询接口!!! 2021-12-14 16:33:07 +08:00
yuezhihang 0babd2b56f 统一修改了一下分页 2021-12-14 16:07:51 +08:00
yuezhihang 6db9220082 手机端查询人员数据 2021-12-13 17:49:33 +08:00
yuezhihang 301ba42d65 手机端查人接口 以及 部分涉及到开耀的接口 加了备注 我先改了一下 等开耀回来看一下 2021-12-13 16:17:25 +08:00
yuezhihang c87d843055 征求意见流程新---！！！！ 2021-12-13 14:15:44 +08:00
yuezhihang 1a88f21eb0 未符合项整改回显 2021-12-12 10:52:29 +08:00
yuezhihang 48bc83ff4f Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-10 14:49:46 +08:00
yuezhihang 2623bb0954 国内清单!! 2021-12-10 14:49:41 +08:00
yuezhihang 97261de96e Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-10 13:51:31 +08:00
yuezhihang 483429fb8b 未符合项目整改--》批量关闭未符合项目接口 直接修改的closeStatus 2021-12-10 13:51:26 +08:00
yuezhihang 5cfa69c8e3 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-09 16:56:05 +08:00
yuezhihang 45dab72515 标准条件查询 2021-12-09 16:55:55 +08:00
yuezhihang 2f402f737d 公开征求意见导出 部门数据导出 2021-12-09 10:24:10 +08:00
yuezhihang 2bbdb32e8f 项目维度查询分解单数据错误bug 2021-12-08 17:23:06 +08:00
yuezhihang c53b405891 技术评估结果排序--》猜测需要添加字段区分国内海外 ！！！ 后续看需求是否添加 2021-12-08 14:06:21 +08:00
yuezhihang 3da2c21cd9 拆分标准 复制修复 --->对应bug为无法删除 2021-12-07 17:33:15 +08:00
yuezhihang 01b503fda5 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-07 15:20:05 +08:00
yuezhihang 1edd95bccc Ocr部分bug 和工作组部分bug修复 2021-12-07 15:19:55 +08:00
yuezhihang 39ffe69442 登录接口新增字段 上一级部门 id和名称 2021-12-07 09:21:14 +08:00
yuezhihang 95642b0166 登陆接口 新增返回字段-----部门id 和 部门名称 2021-12-07 09:21:14 +08:00
yuezhihang 0ce4df7252 未符合项整改加排序 2021-12-07 09:21:14 +08:00
yuezhihang 995891757d 补充上一版本 2021-12-07 09:21:14 +08:00
yuezhihang 4478fecf73 项目清单 新增字段符合-未符合-不展示逻辑 以及部分条件下未维护清单不显示问题 2021-12-07 09:21:14 +08:00
yuezhihang 0e68e431ea 为符合项 排序 2021-12-07 09:21:14 +08:00
yuezhihang 7f5fdbd321 删除草稿接口 api/lawss/activiti/delCG 2021-12-07 09:21:14 +08:00
yuezhihang a501f87a68 项目清单加字段 ！ 白名单添加一个导出 2021-12-07 09:21:14 +08:00
yuezhihang 82aa2a1139 登录接口新增字段 上一级部门 id和名称 2021-12-06 17:05:37 +08:00
yuezhihang 58cbe73a09 登陆接口 新增返回字段-----部门id 和 部门名称 2021-12-06 15:39:10 +08:00
yuezhihang 6b3d87c890 未符合项整改加排序 2021-12-06 14:51:25 +08:00
yuezhihang 5df6ea6c73 补充上一版本 2021-12-06 09:47:48 +08:00
yuezhihang 830f259792 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-06 09:45:45 +08:00
yuezhihang 3a952eea82 项目清单 新增字段符合-未符合-不展示逻辑 以及部分条件下未维护清单不显示问题 2021-12-06 09:45:36 +08:00
yuezhihang 02edc0ba2e 为符合项 排序 2021-12-05 20:25:49 +08:00
yuezhihang 51e67d4440 删除草稿接口 api/lawss/activiti/delCG 2021-12-05 15:50:46 +08:00
yuezhihang 7f88babb5f 项目清单加字段 ！ 白名单添加一个导出 2021-12-05 15:09:19 +08:00
yuezhihang 505be3cdc9 企标制修订计划模块 半重构o(*￣︶￣*)o 2021-12-03 14:48:31 +08:00
yuezhihang 542433742b Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-02 10:25:18 +08:00
yuezhihang 0569a33350 评估结果查看 2021-12-02 10:25:10 +08:00
yuezhihang 895289a1a0 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-01 17:59:23 +08:00
yuezhihang 455fc2ba0e 12.1bug修复 2021-12-01 17:59:17 +08:00
yuezhihang 4c31f54a5e 11.26 项目维度 查询标准数据接口修改1 2021-11-26 16:41:50 +08:00
yuezhihang 08853080db 未符合项整改 -新增和修改 2021-11-25 17:24:45 +08:00
yuezhihang 6178ba696c ocr按钮 和 拆分按钮 提供数据接口 修改 2021-11-24 11:50:17 +08:00
yuezhihang 3c46d1f88d 11.24 异步操作添加 导出字段删除 查询修改 2021-11-24 10:55:35 +08:00
yuezhihang 0f8bc78441 查询代办的新接口 目前只有标准号 标准名称 和 标准类型 的查询 2021-11-23 17:02:16 +08:00
yuezhihang 32fc6eb43a 风险程度 修改接口 目前是根据数据批量修改 重点是时间 因为时间能保持数据的唯一性 2021-11-23 14:46:47 +08:00
yuezhihang ce7a6656b4 新增风险程度字段 2021-11-23 13:49:44 +08:00
yuezhihang 48bde6960b 解决比对标准名称和标准号不回显问题 2021-11-23 10:46:54 +08:00
yuezhihang 804a946717 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-11-23 09:48:19 +08:00
yuezhihang 3474649cd5 ocr新按钮查询 2021-11-23 09:48:09 +08:00
yuezhihang f08ffeb475 方法提取 2021-11-22 13:44:20 +08:00
yuezhihang 7a5787d0ad Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-11-22 09:26:40 +08:00
yuezhihang 7e6ee28c2e 预警查询 2021-11-22 09:26:27 +08:00
yuezhihang 8572e2a650 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-11-19 16:51:21 +08:00
yuezhihang d23f7478ae 产品线新增查询条件 以及bug修复 2021-11-19 16:51:10 +08:00
yuezhihang 7017dff372 Merge remote-tracking branch 'origin/origin/Three' into develop_master 2021-11-19 13:54:14 +08:00
yuezhihang 35591e8e86 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-11-19 13:54:07 +08:00
yuezhihang 0f704dde0a Merge remote-tracking branch 'origin/origin/Three' into develop_master 2021-11-19 13:43:23 +08:00
yuezhihang c260cd5533 清单查询数据报错bug修复 2021-11-18 16:17:27 +08:00
yuezhihang 7485c04801 下载程序异常 2021-11-18 15:52:03 +08:00
yuezhihang 96c6202d61 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-11-18 10:23:39 +08:00
yuezhihang f1175010f7 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-11-17 14:04:00 +08:00
yuezhihang 216a437e9e Merge remote-tracking branch 'origin/origin/Three' into develop_master 2021-11-17 14:03:48 +08:00
yuezhihang 478cdd4c87 新流程的Key 2021-11-16 16:59:23 +08:00
yuezhihang 5fb6bd278a Merge remote-tracking branch 'origin/origin/Three' into develop_master 2021-11-13 10:17:02 +08:00
yuezhihang 5363b35153 标准政策 新增去除重复 2021-11-12 10:27:43 +08:00
yuezhihang 7258ce26cf Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-11-12 09:28:00 +08:00
yuezhihang 0158e29009 工作组查询 修改 2021-11-12 09:27:49 +08:00
yuezhihang b714156172 工作组查询优化 2021-11-11 14:13:11 +08:00
yuezhihang 333143549f 拆分查看页，导出程序异常白名单加入 工作组编辑 2021-11-10 15:52:43 +08:00
yuezhihang 139911ff51 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-11-10 13:52:50 +08:00
yuezhihang 2dcb38a066 数据库时间差问题修改 2021-11-10 13:52:36 +08:00
yuezhihang 6dedfa9ea4 工作组 新增方法 2021-11-10 09:32:22 +08:00
yuezhihang 80a6df7ef6 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-11-09 14:21:00 +08:00
yuezhihang c4a26fa385 清单下拉填充bug修复 2021-11-09 14:20:44 +08:00
yuezhihang e12f595891 查人组件 名称修改 2021-11-08 17:25:33 +08:00
yuezhihang 85a4b19b47 清单查询速度优化 2021-11-08 15:33:18 +08:00
yuezhihang d970690908 选人组件修改 2021-11-08 14:48:35 +08:00
yuezhihang 049d9dbb81 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-11-08 13:55:44 +08:00
yuezhihang b38cfc2a01 下拉填充 2021-11-08 13:55:35 +08:00
yuezhihang 82de89f8c2 Merge remote-tracking branch 'origin/develop_1' into develop_master 2021-11-07 19:04:35 +08:00
yuezhihang 1e61e5cfb4 清单查询bug 2021-11-07 19:00:08 +08:00
yuezhihang 438ee5ff5f 合规评估-标准维度查询不出来bug修复 以及导出接口白名单 2021-11-07 17:00:49 +08:00
yuezhihang 1b45458739 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-11-05 17:42:35 +08:00
yuezhihang fbd235b655 工作组 相关代码 表关联以及增删改查 2021-11-05 17:42:27 +08:00
yuezhihang d42d9f34f4 标准详情分页查询 ；老版本新接口 2021-11-01 17:23:09 +08:00
yuezhihang e22aa58bd5 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-11-01 13:59:41 +08:00
yuezhihang e4c5ae815f 标准法规清单-选择标准法规按钮无法勾选bug修复 && 流程查询生产线初步修改 2021-11-01 13:59:32 +08:00
yuezhihang 539cf47101 清单 流程回退 2021-10-29 14:02:47 +08:00
yuezhihang 0d18758178 项目评估流程标准维度-查询数据来源修复 2021-10-27 13:47:29 +08:00
yuezhihang 9ec34d5125 Merge remote-tracking branch 'origin/develop_master' into develop_master 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
 2021-10-27 13:39:58 +08:00
yuezhihang d02b73e2dd 标准库查询 和 流程发起界面查询 做了一个标志位的区分 目的是为了提高标准库的查询速度 2021-10-27 13:39:07 +08:00
yuezhihang a675e374bc 清单 流程回退 2021-10-27 09:38:56 +08:00
yuezhihang 23e70eba5b Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-10-25 15:10:04 +08:00