 super_liu
|
8b225fbb14
|
feat: There is no way the,
|
2021-12-21 17:01:48 +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 |
|
|
zhaokaiyao@91isoft.com
|
20877855aa
|
国内外 发布日期查询
|
2021-12-17 16:11:37 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
a8544607de
|
高级搜索 发布日期范围查询
|
2021-12-17 10:55:44 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
3bf802fd75
|
国内外删除提示
|
2021-12-16 20:47:45 +08:00 |
|
|
yuezhihang
|
45dab72515
|
标准条件查询
|
2021-12-09 16:55:55 +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
|
3e877d48fe
|
去除多选日期时分秒
|
2021-12-06 14:06:20 +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
|
7f88babb5f
|
项目清单加字段 ！ 白名单添加一个导出
|
2021-12-05 15:09:19 +08:00 |
|
|
王夏晖
|
e7302f306d
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request LiuChao/foton-slrs-system-rest!263
|
2021-12-01 20:54:21 +08:00 |
|
|
yuezhihang
|
455fc2ba0e
|
12.1bug修复
|
2021-12-01 17:59:17 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
f76e0aabe5
|
取消事务
|
2021-12-01 16:49:45 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
d977214a56
|
预警查询
|
2021-12-01 11:25:56 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
b43cc664e2
|
//todo
|
2021-11-30 20:47:46 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
79f0dd6c90
|
当文件被拆分后才在详情显示分解单按钮,取消拆分后自动导入分解单
|
2021-11-23 16:33:49 +08:00 |
|
|
super_liu
|
01568460ca
|
feat: There is no way the,
|
2021-11-13 22:37:24 +08:00 |
|
|
super_liu
|
d6432e2746
|
Merge branch 'develop_migration' into 'develop_master'
feat: There is no way the,
See merge request LiuChao/foton-slrs-system-rest!226
|
2021-11-10 13:16:27 +08:00 |
|
|
super_liu
|
c333bd9e3e
|
feat: There is no way the,
|
2021-11-10 12:57:30 +08:00 |
|
|
yuezhihang
|
1e61e5cfb4
|
清单查询bug
|
2021-11-07 19:00:08 +08:00 |
|
|
yuezhihang
|
438ee5ff5f
|
合规评估-标准维度查询不出来bug修复 以及导出接口白名单
|
2021-11-07 17:00:49 +08:00 |
|
|
super_liu
|
8b401b8832
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request LiuChao/foton-slrs-system-rest!222
|
2021-11-07 16:49:22 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
3f32907acf
|
过内外标准发布日期排序
|
2021-11-07 13:47:03 +08:00 |
|
|
super_liu
|
8b12a63925
|
feat: There is no way the,
|
2021-11-06 23:17:29 +08:00 |
|
|
super_liu
|
3171ce4622
|
feat: There is no way the, #50742
|
2021-11-05 10:51:36 +08:00 |
|
|
super_liu
|
3cd3266899
|
Merge branch 'develop_migration' into 'develop_master'
Develop migration
See merge request LiuChao/foton-slrs-system-rest!214
|
2021-11-01 18:03:47 +08:00 |
|
|
super_liu
|
cab90f06ee
|
feat: There is no way the,Laws
|
2021-11-01 17:59:24 +08:00 |
|
|
yuezhihang
|
d42d9f34f4
|
标准详情分页查询 ；老版本新接口
|
2021-11-01 17:23:09 +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 |
|
|
super_liu
|
c2e7b589d2
|
feat: There is no way the
|
2021-10-27 13:35:51 +08:00 |
|
|
super_liu
|
1918e0da78
|
feat: There is no way the, TO optimize the query
|
2021-10-22 17:03:29 +08:00 |
|
|
super_liu
|
9eff2340a2
|
feat: There is no way the, TO optimize the query
|
2021-10-22 15:50:07 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
d09cdb1d42
|
通过id绑定责任工程师和责任部门名称
|
2021-10-20 11:24:49 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
9b5bf72fad
|
文件后缀大写
|
2021-10-17 14:26:44 +08:00 |
|
|
Mr.Z
|
aa5e7004dc
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
# Conflicts:
# adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
|
2021-09-28 10:52:29 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
ce7812e704
|
把 standtextStatusShow改为了standTextStatusShow
|
2021-09-27 13:54:14 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
d9d5aeb284
|
标准导出
|
2021-09-27 10:18:26 +08:00 |
|
|
yanyizhou
|
c7e3c97339
|
国内外标准--如果清单下挂着标准A，在标准库里删除标准A的话，加个验证 不让删这个标准
|
2021-09-23 15:17:41 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
ccf7d32945
|
首页标准发布 只查询文本状态为即将实施的数据
|
2021-09-16 19:27:36 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
d6331ab155
|
标准详情,已被分解的的文本才有分解单按钮
|
2021-09-15 18:01:06 +08:00 |
|
|
super_liu
|
e85d3daecb
|
feat: There is no way the #47611
|
2021-09-06 17:42:34 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
19c52a212b
|
解决企标高级搜索,putTime,issuTime,textStatusBuss失效的问题
|
2021-09-04 10:09:40 +08:00 |
|
|
yanyizhou
|
3070ec5e59
|
合并代码冲突
|
2021-08-27 15:30:23 +08:00 |
|
|
super_liu
|
a971d3bcf7
|
feat: There is no way the
|
2021-08-24 13:40:45 +08:00 |
|