 yuezhihang
|
699b1ef9c4
|
车型项目库查询bug
|
2021-08-13 16:44:09 +08:00 |
|
|
yuezhihang
|
3327223c25
|
Merge remote-tracking branch 'origin/develop_1' into develop_master
|
2021-08-13 09:06:16 +08:00 |
|
|
yuezhihang
|
9f0ed13874
|
合规评估项目数据过滤
|
2021-08-12 18:08:29 +08:00 |
|
|
yuezhihang
|
5254f397b8
|
项目评估流程
|
2021-08-12 18:00:46 +08:00 |
|
|
yuezhihang
|
7d4dcf561a
|
查询总数 错误bug
|
2021-08-12 16:22:36 +08:00 |
|
|
shen_yan_pu
|
0ae192be2f
|
修改标准清单的实施日期字段
|
2021-08-12 10:40:17 +08:00 |
|
|
yuezhihang
|
0326e66b54
|
启动bug修复
|
2021-08-12 09:13:06 +08:00 |
|
|
yuezhihang
|
cdf9e16f1d
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-08-12 09:06:22 +08:00 |
|
|
Mr.Z
|
db5ea125fb
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-08-11 23:06:47 +08:00 |
|
|
Mr.Z
|
1374bc5807
|
zyh自用
|
2021-08-11 23:03:40 +08:00 |
|
|
super_liu
|
dfc86922f2
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request !105
|
2021-08-11 09:42:05 +00:00 |
|
|
yuezhihang
|
440bb7d038
|
标准总数返回
！！！！！
|
2021-08-11 14:23:49 +08:00 |
|
|
yuezhihang
|
8c92abab31
|
过滤数据！！！
|
2021-08-11 14:23:49 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
530a6febf6
|
查看分解单字段修改
|
2021-08-11 13:36:50 +08:00 |
|
|
2510220824
|
13d51ae2a1
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
|
2021-08-11 13:34:29 +08:00 |
|
|
2510220824
|
b14a80c7a4
|
add:新增同步车型项目，组织数据接口
|
2021-08-11 13:33:42 +08:00 |
|
|
yanyizhou
|
3f66b95e94
|
拆分
|
2021-08-10 19:19:29 +08:00 |
|
|
Mr.Z
|
5cb1fd52cc
|
分解单字段修改
|
2021-08-10 17:29:07 +08:00 |
|
|
yuezhihang
|
e52f316a59
|
标准总数返回
！！！！！
|
2021-08-10 14:49:44 +08:00 |
|
|
yuezhihang
|
1218c4633a
|
代码合并
|
2021-08-09 17:58:19 +08:00 |
|
|
yuezhihang
|
ca80dd9feb
|
Merge remote-tracking branch 'origin/develop_master' into develop_master
# Conflicts:
# adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
|
2021-08-09 17:55:11 +08:00 |
|
|
yuezhihang
|
3dd392b411
|
过滤数据！！！
|
2021-08-09 17:52:01 +08:00 |
|
|
王夏晖
|
d7ed47a58f
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request !99
|
2021-08-09 09:11:47 +00:00 |
|
|
2510220824
|
4302fed66f
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
# Conflicts:
# adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
|
2021-08-09 17:10:30 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
7a51e1d9b4
|
标准详情->标准分解单查询 mapper<if>字符
|
2021-08-09 16:56:29 +08:00 |
|
|
yuezhihang
|
1b8884fe75
|
车型项目库！
|
2021-08-09 11:07:26 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
b0eeb87bd1
|
标准详情->标准分解单查询
|
2021-08-08 22:40:37 +08:00 |
|
|
yanyizhou
|
9f4bbd2eb6
|
修复了车型项目库标准删除不是关联标准id和项目id删除而是直接按照标准id删除标准的bug
|
2021-08-08 10:17:38 +08:00 |
|
|
yuezhihang
|
82b72b191d
|
解读入库
|
2021-08-05 14:51:45 +08:00 |
|
|
Mr.Z
|
6eb0ed526e
|
标准法规清单，点击导出，导出数据中“标准编号”字段改为“标准号",标准号格式错误
|
2021-08-04 20:09:44 +08:00 |
|
|
super_liu
|
1e1be015fe
|
Merge branch 'develop_3' into 'develop_master'
Develop 3
See merge request !89
|
2021-08-03 07:50:29 +00:00 |
|
|
zhaokaiyao@91isoft.com
|
294866bb1e
|
修复了标准拆分--拆分页面，该页面的数据回显重复的问题
|
2021-08-03 14:28:47 +08:00 |
|
|
zzy
|
ed4dd5ae23
|
update：增加字段
|
2021-07-30 17:55:43 +08:00 |
|
|
zzy
|
faef2cdf59
|
Update：标准解读流程检索
|
2021-07-30 16:45:23 +08:00 |
|
|
zzy
|
3c68a2a668
|
Merge remote-tracking branch 'origin/develop_3' into develop_1
|
2021-07-30 16:43:39 +08:00 |
|
|
王夏晖
|
0d2ac245b2
|
Merge branch 'develop_1' into 'develop_master'
Develop 1
See merge request !76
|
2021-07-30 01:01:28 +00:00 |
|
|
super_liu
|
00894cbeef
|
Merge branch 'develop_master' into develop_3
# Conflicts:
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
|
2021-07-30 00:54:34 +08:00 |
|
|
super_liu
|
d7f3fc9f95
|
feat: 国内外标准 反向标准显示逻辑
|
2021-07-30 00:48:48 +08:00 |
|
|
zzy
|
dd281f63ad
|
Update：清单高级检索
|
2021-07-29 16:59:25 +08:00 |
|
|
yuezhihang
|
a017d3acd6
|
Merge remote-tracking branch 'origin/develop_1' into develop_master
|
2021-07-29 15:22:23 +08:00 |
|
|
zzy
|
9d3d8e1198
|
Merge remote-tracking branch 'origin/develop_master' into develop_1
|
2021-07-29 15:19:39 +08:00 |
|
|
zzy
|
80226d5cfb
|
update：修改清单信息
|
2021-07-29 11:14:47 +08:00 |
|
|
王夏晖
|
a991f1550c
|
Merge branch 'develop_1' into 'develop_master'
update：修改sql语句
See merge request !65
|
2021-07-28 06:18:22 +00:00 |
|
|
zzy
|
6dc14af762
|
update：修改sql语句
|
2021-07-28 14:05:11 +08:00 |
|
|
王夏晖
|
e237170f61
|
Merge branch 'develop_1' into 'develop_master'
Develop 1
See merge request !64
|
2021-07-28 02:49:56 +00:00 |
|
|
zzy
|
b3630e8ad6
|
update：修复导出
|
2021-07-28 10:10:25 +08:00 |
|
|
王夏晖
|
d5ed912644
|
Merge branch 'develop_1' into 'develop_master'
update：清单增加字段
See merge request !60
|
2021-07-27 07:41:14 +00:00 |
|
|
zhaokaiyao@91isoft.com
|
9d4600b96c
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-07-27 09:20:28 +08:00 |
|
|
zzy
|
c3c69e87ef
|
update：清单增加字段
|
2021-07-27 09:20:27 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
f4c7b2ba68
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
# Conflicts:
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
|
2021-07-26 20:12:12 +08:00 |
|