FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,510 Commits 1 Branch 0 Tags
c9e08a1fb557691d4b5cfbed0ab801d931b89983
Commit Graph
428 Commits
Author SHA1 Message Date
zhaokaiyao@91isoft.com c9e08a1fb5 国内外日期查询 总数错误 2021-12-22 20:34:40 +08:00
zhaokaiyao@91isoft.com 6df2b5a7d3 国内外标准代替标准号查询 2021-12-22 17:50:23 +08:00
zhaokaiyao@91isoft.com 1432bdb520 预警 2021-12-20 20:26:51 +08:00
王夏晖 28e5923544 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!299
 2021-12-20 17:02:18 +08:00
yuezhihang 09e7e2ffee 标准查询没有total问题修复 2021-12-20 13:51:57 +08:00
yuezhihang ce40aed7cb 企标制修订计划模块 2021-12-17 16:24:40 +08:00
zhaokaiyao@91isoft.com 20877855aa 国内外 发布日期查询 2021-12-17 16:11:37 +08:00
yuezhihang 204a2c8225 Merge remote-tracking branch 'origin/develop_master' into develop_master 2021-12-17 11:16:12 +08:00
yuezhihang 773e33988e 征求意见流程--》导出功能完善 2021-12-17 11:16:02 +08:00
zhaokaiyao@91isoft.com a8544607de 高级搜索 发布日期范围查询 2021-12-17 10:55:44 +08:00
zhaokaiyao@91isoft.com 4f18df878c Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-12-16 20:49:46 +08:00
yuezhihang 391169aeea 公开征求意见部分 的导出接口预备 以及 流程中上传附件数据预备 （后端自测完成 有数据回显需要前台从流程开始更改传输数据） 2021-12-16 18:07:54 +08:00
zhaokaiyao@91isoft.com e0f4eb3d0f 国内外查询总数的sql 2021-12-16 17:42:17 +08:00
yuezhihang 349c283db4 登陆人或责任人部门错误问题 已修复 （可能存在残留） 2021-12-16 16:56:53 +08:00
yuezhihang a5e00ef286 公开征求意见以及流程部分功能修复 2021-12-16 15:33:21 +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
王夏晖 0964813f89 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!282
 2021-12-15 09:16:25 +08:00
zhaokaiyao@91isoft.com 5eeb60b7f3 资料中心 2021-12-14 17:09:05 +08:00
yuezhihang a8fda1bb94 标准清单查询接口!!! 2021-12-14 16:33:07 +08:00
yuezhihang 0babd2b56f 统一修改了一下分页 2021-12-14 16:07:51 +08:00
yuezhihang 1a88f21eb0 未符合项整改回显 2021-12-12 10:52:29 +08:00
zhaokaiyao@91isoft.com 387b7485bf Merge remote-tracking branch 'origin/develop_master' into develop_3 2021-12-10 17:16:12 +08:00
zhaokaiyao@91isoft.com 8537648dde 评分历史排序 2021-12-10 16:15:39 +08:00
zhaokaiyao@91isoft.com c783f40d41 预警excel导出 数据与表格对应 2021-12-10 15:38:41 +08:00
zhaokaiyao@91isoft.com 13b5444e24 质量评分节点 2021-12-10 13:47:42 +08:00
王夏晖 304bebc284 Merge branch 'develop_3' into 'develop_master' 
预警导出 和 定时任务

See merge request LiuChao/foton-slrs-system-rest!277
 2021-12-09 19:36:43 +08:00
zhaokaiyao@91isoft.com a86fe68308 预警导出 和 定时任务 2021-12-09 17:49:51 +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
super_liu a879fd9ff2 Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!276
 2021-12-09 15:20:48 +08:00
zhaokaiyao@91isoft.com 0cabb928d7 查看分解单 实施日期多个 2021-12-09 14:26:50 +08:00
zhaokaiyao@91isoft.com 276f0a9726 企标评分 2021-12-09 13:45:49 +08:00
王夏晖 751448384a Merge branch 'develop_3' into 'develop_master' 
Develop 3

See merge request LiuChao/foton-slrs-system-rest!275
 2021-12-09 13:33:10 +08:00
yuezhihang 2f402f737d 公开征求意见导出 部门数据导出 2021-12-09 10:24:10 +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
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 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
王夏晖 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
zhaokaiyao@91isoft.com 8d211a52c2 评分表 2021-12-06 18:03:49 +08:00
yuezhihang 6b3d87c890 未符合项整改加排序 2021-12-06 14:51:25 +08:00