 super_liu
|
60c4957bcb
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request LiuChao/foton-slrs-system-rest!319
|
2021-12-23 22:03:17 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
2bd9e7f323
|
查询总数
|
2021-12-23 16:11:36 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
c9e08a1fb5
|
国内外日期查询 总数错误
|
2021-12-22 20:34:40 +08:00 |
|
|
王夏晖
|
7d6a2be540
|
Merge branch 'develop_1' into 'develop_master'
Develop 1
See merge request LiuChao/foton-slrs-system-rest!314
|
2021-12-22 19:24:29 +08:00 |
|
|
王夏晖
|
d99b9cfc7c
|
Merge branch 'develop_3' into 'develop_master'
国内外标准代替标准号查询
See merge request LiuChao/foton-slrs-system-rest!313
|
2021-12-22 19:23:48 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
6df2b5a7d3
|
国内外标准代替标准号查询
|
2021-12-22 17:50:23 +08:00 |
|
|
yanyizhou
|
f8c9ab1d55
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-12-22 15:09:05 +08:00 |
|
|
yuezhihang
|
5f5051bd2f
|
未符合项bug修复 --->新增支持查询责任部门
|
2021-12-22 14:03:11 +08:00 |
|
|
yuezhihang
|
8c72debb05
|
责任部门导出和日历修改 bug修复
|
2021-12-22 11:09:20 +08:00 |
|
|
yuezhihang
|
5e1df05c6b
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-12-21 20:42:18 +08:00 |
|
|
yuezhihang
|
22cc39c0e2
|
标准化活动参会入会
|
2021-12-21 20:42:06 +08:00 |
|
|
super_liu
|
8ef5e27843
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,
See merge request LiuChao/foton-slrs-system-rest!308
|
2021-12-21 14:41:06 +08:00 |
|
|
super_liu
|
382f42b8e5
|
feat: There is no way the,
|
2021-12-21 14:39:06 +08:00 |
|
|
yuezhihang
|
3880e0c68f
|
标准维度选数据出现全空数据的问题
|
2021-12-21 11:05:26 +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 |
|