FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,416 Commits 1 Branch 0 Tags
6e52fb44bfd96f944e67f4e28b26ba73ff48aa9a
Commit Graph
1416 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
zhaokaiyao@91isoft.com 6e52fb44bf Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-12-09 10:09:31 +08:00
zhaokaiyao@91isoft.com ab07fbf9ce 新增标准与修改标准 插入数据库取消时分秒 2021-12-09 10:07:20 +08:00
zhaokaiyao@91isoft.com c4eb74a211 Merge remote-tracking branch 'origin/develop_master' into develop_3 
# Conflicts:
#	adc-da-activiti/src/main/java/com/adc/da/FeignClient/workFlowFeignClient.java
#	adc-da-activiti/src/main/java/com/adc/da/workFlow/controller/WorkFlowController.java
 2021-12-08 17:24:48 +08:00
yuezhihang 2bbdb32e8f 项目维度查询分解单数据错误bug 2021-12-08 17:23:06 +08:00
super_liu 867f147edb Merge branch 'origin/Three' into 'develop_master' 
Origin/three

See merge request LiuChao/foton-slrs-system-rest!274
 2021-12-08 15:51:11 +08:00
Superman_Main d9f7c7ea8b Merge branch 'develop_master' into origin/Three 2021-12-08 15:49:59 +08:00
yuezhihang c53b405891 技术评估结果排序--》猜测需要添加字段区分国内海外 ！！！ 后续看需求是否添加 2021-12-08 14:06:21 +08:00
zhaokaiyao@91isoft.com a018459ad1 评分 2021-12-07 17:46:12 +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
zhaokaiyao@91isoft.com de2e2977a9 评分历史 创建时间和修改时间 2021-12-07 09:59:02 +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
王夏晖 359a384c70 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!270
 2021-12-06 18:11:09 +08:00
zj a2d002d659 ocr回到附件名称斜杠转换，避免造成路径读取错误 2021-12-06 18:06:28 +08:00
zhaokaiyao@91isoft.com 8d211a52c2 评分表 2021-12-06 18:03:49 +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
zhaokaiyao@91isoft.com 3e877d48fe 去除多选日期时分秒 2021-12-06 14:06:20 +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
王夏晖 ffde83f71e Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!268
 2021-12-05 21:08:16 +08:00
zhaokaiyao@91isoft.com 691e7b6bcc 更新法规是否纳入法规清单 2021-12-05 20:56:32 +08:00
yuezhihang 02edc0ba2e 为符合项 排序 2021-12-05 20:25:49 +08:00
zhaokaiyao@91isoft.com 8ae7ed4dd9 企标评分 2021-12-05 20:23:21 +08:00
zhaokaiyao@91isoft.com 7cd3262d3f 预警排序 2021-12-05 19:57:27 +08:00
zhaokaiyao@91isoft.com 492a5e9622 海外标准号查询 2021-12-05 19:55:40 +08:00
zhaokaiyao@91isoft.com a1fee557af 预警导出 2021-12-05 18:42:51 +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
zhaokaiyao@91isoft.com 2d1b55fa76 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-12-05 09:46:16 +08:00
zhaokaiyao@91isoft.com fb04c67b17 企标评分 2021-12-05 09:43:31 +08:00
yuezhihang 505be3cdc9 企标制修订计划模块 半重构o(*￣︶￣*)o 2021-12-03 14:48:31 +08:00
liao dab0c3db12 leo 2021-12-03 11:29:49 +08:00
王夏晖 c1e1f8a495 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!266
 2021-12-02 21:16:11 +08:00
zhaokaiyao@91isoft.com 41ad39f343 Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-12-02 19:36:06 +08:00
zhaokaiyao@91isoft.com 235f81b35c 标准号搜索框可以搜索标准名称 
标准名称搜索框可以搜索标准号
 2021-12-02 17:24:37 +08:00
zhaokaiyao@91isoft.com a7206afc5d 预警 标准实施日期子表 2021-12-02 16:24:40 +08:00
王夏晖 a0924c6893 Merge branch 'origin/Three' into 'develop_master' 
Origin/three

See merge request LiuChao/foton-slrs-system-rest!265
 2021-12-02 10:49:56 +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