 yanyizhou
|
84916bb230
|
标准法规清单-新增-导出 程序异常
|
2021-10-21 14:37:34 +08:00 |
|
|
yanyizhou
|
54125b736d
|
commit
|
2021-10-21 10:51:38 +08:00 |
|
|
yanyizhou
|
6a9d736aa8
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-10-21 09:12:38 +08:00 |
|
|
yanyizhou
|
c19d77c06d
|
标准法规清单的导出
|
2021-10-19 16:46:06 +08:00 |
|
|
yanyizhou
|
58fc669581
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-09-27 17:26:53 +08:00 |
|
|
yanyizhou
|
4584b06a42
|
未符合项整改-导出 字段显示有问题
|
2021-09-27 17:26:48 +08:00 |
|
|
yanyizhou
|
21372dbaa4
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-09-27 14:52:53 +08:00 |
|
|
yanyizhou
|
ae1f05c000
|
标准法规清单-编辑-导出 删除这些字段
|
2021-09-27 14:52:48 +08:00 |
|
|
yanyizhou
|
d2ad6b174c
|
配置管理-机构管理-操作-禁用 点击后 无提示 无效果
|
2021-09-26 14:48:20 +08:00 |
|
|
yanyizhou
|
30c2b5de44
|
配置管理-机构管理 输入检索条件 查询 有12条 但是显示25条 25条是所有的数据数
|
2021-09-26 10:34:07 +08:00 |
|
|
yanyizhou
|
c7e3c97339
|
国内外标准--如果清单下挂着标准A，在标准库里删除标准A的话，加个验证 不让删这个标准
|
2021-09-23 15:17:41 +08:00 |
|
|
yanyizhou
|
8dd5ed9230
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-09-23 09:15:42 +08:00 |
|
|
yanyizhou
|
bbfcbae5a0
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-09-17 09:42:15 +08:00 |
|
|
yanyizhou
|
de61789265
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-09-17 09:40:27 +08:00 |
|
|
yanyizhou
|
d11c155424
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-09-15 09:10:56 +08:00 |
|
|
yanyizhou
|
7100085879
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-09-14 16:41:51 +08:00 |
|
|
yanyizhou
|
c4274636fb
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-09-14 15:50:38 +08:00 |
|
|
yanyizhou
|
ebf930098c
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-09-09 19:37:34 +08:00 |
|
|
yanyizhou
|
d01cff0285
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-09-09 09:09:12 +08:00 |
|
|
yanyizhou
|
3a044912c2
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-09-08 09:06:06 +08:00 |
|
|
yanyizhou
|
14a7228213
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-09-07 09:22:51 +08:00 |
|
|
yanyizhou
|
446f8f54e9
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-09-06 18:29:25 +08:00 |
|
|
yanyizhou
|
912cda6762
|
配置管理 机构管理 查询加分页
|
2021-09-06 18:29:10 +08:00 |
|
|
yanyizhou
|
34c73432b9
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-09-06 09:29:45 +08:00 |
|
|
yanyizhou
|
182b4bcf72
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-09-06 09:29:42 +08:00 |
|
|
yanyizhou
|
1909b24bbc
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-09-04 10:23:58 +08:00 |
|
|
yanyizhou
|
7ba6efe95f
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-09-03 17:25:18 +08:00 |
|
|
yanyizhou
|
1f2d738ee3
|
机构管理--加筛选条件：姓名和邮箱
|
2021-09-03 17:24:59 +08:00 |
|
|
yanyizhou
|
08c19dd1f4
|
/api/sarStandProjectLibrary/save 接口
|
2021-09-03 10:47:37 +08:00 |
|
|
yanyizhou
|
0b97292bca
|
实现 /api/sarStandProjectLibrary/save 接口
|
2021-09-02 22:55:43 +08:00 |
|
|
yanyizhou
|
42491993a6
|
Merge remote-tracking branch 'origin/develop_3' into develop_1
|
2021-09-02 21:22:45 +08:00 |
|
|
yanyizhou
|
1033aecfa4
|
Merge remote-tracking branch 'origin/develop_3' into develop_1
|
2021-09-02 21:20:45 +08:00 |
|
|
yanyizhou
|
b72ed741f0
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-09-02 21:20:16 +08:00 |
|
|
yanyizhou
|
ee85f48542
|
开耀和宇欢冲突之后的合并代码
|
2021-09-01 14:25:16 +08:00 |
|
|
yanyizhou
|
fc608845d8
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
# Conflicts:
# adc-da-slrs/src/main/java/com/adc/da/scheduled/ScheduledJob.java
|
2021-09-01 11:19:57 +08:00 |
|
|
yanyizhou
|
e86f5cfbe7
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-09-01 11:12:29 +08:00 |
|
|
yanyizhou
|
05a77b34a0
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-31 11:18:09 +08:00 |
|
|
yanyizhou
|
e706eaea22
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-30 18:07:00 +08:00 |
|
|
yanyizhou
|
1739a3d555
|
标准预警--加筛选条件 优化了代码（之前查询条件只有一个，所以传的string，现在有很多个，所以传了一个bean，我就把之前传的string那部分代码删了）希望人没事
|
2021-08-30 18:06:47 +08:00 |
|
|
yanyizhou
|
de17b97ad9
|
标准预警--加筛选条件
|
2021-08-30 17:56:27 +08:00 |
|
|
yanyizhou
|
00a19e76ba
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-30 15:26:10 +08:00 |
|
|
yanyizhou
|
e443ee6164
|
标准合规评估结果--技术评估结果 查看里面的查询条件更改为标准号/标准名称和具体章条
|
2021-08-30 15:25:54 +08:00 |
|
|
yanyizhou
|
b7ccbbfc45
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-30 10:34:17 +08:00 |
|
|
yanyizhou
|
88cb99ad9b
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-08-30 09:05:14 +08:00 |
|
|
yanyizhou
|
1b38560d9f
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-27 16:32:00 +08:00 |
|
|
yanyizhou
|
87f3c15a7b
|
不一致项 查询 加standType
|
2021-08-27 15:30:23 +08:00 |
|
|
yanyizhou
|
3070ec5e59
|
合并代码冲突
|
2021-08-27 15:30:23 +08:00 |
|
|
yanyizhou
|
6148add390
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-27 14:54:57 +08:00 |
|
|
yanyizhou
|
87a6ff319d
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-08-27 14:54:37 +08:00 |
|
|
yanyizhou
|
591701697d
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-27 09:04:55 +08:00 |
|
|
yanyizhou
|
5fe1295f0e
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-08-27 09:04:51 +08:00 |
|
|
yanyizhou
|
ce67c016cd
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-26 11:21:48 +08:00 |
|
|
yanyizhou
|
dbac199130
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-25 17:03:28 +08:00 |
|
|
yanyizhou
|
74167d2d76
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-08-25 17:03:20 +08:00 |
|
|
yanyizhou
|
51055e0374
|
不一致项 查询 加standType
|
2021-08-25 17:02:59 +08:00 |
|
|
yanyizhou
|
fe25f43063
|
合并代码冲突
|
2021-08-25 15:17:55 +08:00 |
|
|
yanyizhou
|
a3c056cbbf
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
# Conflicts:
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
|
2021-08-25 13:36:49 +08:00 |
|
|
yanyizhou
|
2551cb416e
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-25 13:36:06 +08:00 |
|
|
yanyizhou
|
0d5f369597
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-24 13:52:10 +08:00 |
|
|
yanyizhou
|
f1a64d1b75
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-08-24 11:24:13 +08:00 |
|
|
yanyizhou
|
fcbe5647e7
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-24 10:35:26 +08:00 |
|
|
yanyizhou
|
d1288190dd
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-24 10:22:39 +08:00 |
|
|
yanyizhou
|
b33dc11538
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-24 09:16:41 +08:00 |
|
|
yanyizhou
|
fe7795ee61
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-24 09:07:35 +08:00 |
|
|
yanyizhou
|
6f06ed7157
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-08-23 15:55:03 +08:00 |
|
|
yanyizhou
|
b17409a7ae
|
项目评估结果tab页下的查看页面，点击查询按钮，提示程序异常
|
2021-08-23 15:53:56 +08:00 |
|
|
yanyizhou
|
8f53c85efc
|
标准法规清单-国家/地区清单修改提示信息
|
2021-08-23 11:04:25 +08:00 |
|
|
yanyizhou
|
67dc9c829a
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-23 09:47:05 +08:00 |
|
|
yanyizhou
|
23365ffa16
|
标准拆分，拆分之后分解单里也有数据
|
2021-08-20 21:50:40 +08:00 |
|
|
yanyizhou
|
afe965d44e
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
# Conflicts:
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/controller/SarLawsDetailedListController.java
|
2021-08-20 10:57:25 +08:00 |
|
|
yanyizhou
|
00b5eb0760
|
标准法规清单发布/流程--FileName没传值
|
2021-08-20 10:56:46 +08:00 |
|
|
yanyizhou
|
13a4a1d98f
|
标准法规清单-国家/地区清单中的 每个国家或者地区只能建立一次清单，需做限制
修改完毕
|
2021-08-20 09:50:50 +08:00 |
|
|
yanyizhou
|
1155199e13
|
标准法规清单-国家/地区清单中的 每个国家或者地区只能建立一次清单，需做限制
当前的是修改的限制
|
2021-08-19 23:00:00 +08:00 |
|
|
yanyizhou
|
564d5657a0
|
.detailedListVision("v0")去掉
|
2021-08-19 14:51:10 +08:00 |
|
|
yanyizhou
|
732ee46c3e
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-19 10:04:23 +08:00 |
|
|
yanyizhou
|
4e588e6579
|
恢复代码
|
2021-08-19 10:04:09 +08:00 |
|
|
yanyizhou
|
801eea7e50
|
标准法规清单-国家/地区清单中的 每个国家或者地区只能建立一次清单，需做限制
还有标准清单的回显
|
2021-08-18 22:09:12 +08:00 |
|
|
yanyizhou
|
d457a93c13
|
标准法规清单新增限制
|
2021-08-18 19:16:52 +08:00 |
|
|
yanyizhou
|
89a136ee60
|
国家地区新增限制
|
2021-08-18 16:55:20 +08:00 |
|
|
yanyizhou
|
abbf9c257f
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-18 16:44:36 +08:00 |
|
|
yanyizhou
|
9e0aad737c
|
限制
|
2021-08-18 13:46:45 +08:00 |
|
|
yanyizhou
|
79a6ac3b4c
|
commit
|
2021-08-18 09:22:11 +08:00 |
|
|
yanyizhou
|
35877cd941
|
标准法规清单-国家/地区清单中的 每个国家或者地区只能建立一次清单，需做限制
|
2021-08-17 20:11:35 +08:00 |
|
|
yanyizhou
|
249f6bd1eb
|
零部件编号申请模块开发完成
|
2021-08-12 17:57:33 +08:00 |
|
|
yanyizhou
|
7051de09cc
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-12 09:57:28 +08:00 |
|
|
yanyizhou
|
7071cb23c8
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-08-12 09:40:39 +08:00 |
|
|
yanyizhou
|
86ca149885
|
GIT
|
2021-08-12 09:40:16 +08:00 |
|
|
yanyizhou
|
10c81b533d
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-08-10 19:19:45 +08:00 |
|
|
yanyizhou
|
3f66b95e94
|
拆分
|
2021-08-10 19:19:29 +08:00 |
|
|
yanyizhou
|
d9eaa9d7b1
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-10 18:15:49 +08:00 |
|
|
yanyizhou
|
b9c6899e55
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-08-10 18:15:38 +08:00 |
|
|
yanyizhou
|
9af7f462f5
|
Merge remote-tracking branch 'origin/master' into develop_1
# Conflicts:
# adc-da-main/src/main/resources/application-dev.properties
|
2021-08-10 17:29:51 +08:00 |
|
|
yanyizhou
|
d43443640c
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-10 16:01:41 +08:00 |
|
|
yanyizhou
|
7c74df6030
|
零部件模块
|
2021-08-10 16:00:57 +08:00 |
|
|
yanyizhou
|
8bc6f85a56
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-08-08 10:39:12 +08:00 |
|
|
yanyizhou
|
4ea16d31c5
|
岳志航改的bug
|
2021-08-08 10:17:38 +08:00 |
|
|
yanyizhou
|
9f4bbd2eb6
|
修复了车型项目库标准删除不是关联标准id和项目id删除而是直接按照标准id删除标准的bug
|
2021-08-08 10:17:38 +08:00 |
|
|
yanyizhou
|
f4f5e952f6
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-08-06 13:44:56 +08:00 |
|
|
yanyizhou
|
a641acfcc5
|
修复了车型项目库标准删除不是关联标准id和项目id删除而是直接按照标准id删除标准的bug
|
2021-08-06 13:43:42 +08:00 |
|
|
yanyizhou
|
b7f1016135
|
Merge remote-tracking branch 'origin/develop_1' into develop_1
|
2021-08-04 09:58:36 +08:00 |
|