 zhaokaiyao@91isoft.com
|
4acf662b1a
|
Merge remote-tracking branch 'origin/develop_1' into develop_3
|
2021-09-02 21:21:25 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
9251c7a28b
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-09-02 21:07:17 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
e8dd9f42cb
|
save sar_stand_project_team
|
2021-09-02 21:06:40 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
cb2090fc44
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-09-02 10:45:27 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
3d5abafdb0
|
查询文本信息2.0
|
2021-09-02 10:43:11 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
c60ba3c14e
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-08-31 21:39:44 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
f48869a1d5
|
标准预警,判断标准在产车实施日期和新车型实施日期是否在预警期限内
|
2021-08-31 21:39:18 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
a843354794
|
预警标准时设itemsId为'-1'
更改唯一性约束
|
2021-08-31 14:47:54 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
8040cc0711
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-08-31 14:04:42 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
02dc65167e
|
对实施日期进行预警.更新对条款的预警,加入使用车型和责任工程师
|
2021-08-31 14:04:28 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
bb378b56a7
|
新添文本信息接口
|
2021-08-31 14:01:07 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
f53cdd885b
|
更新定时任务时间
|
2021-08-30 10:03:03 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
56e62ac041
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-08-30 09:56:54 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
2fb1faacfa
|
标准预警,标准文本状态自动更新
|
2021-08-30 09:48:35 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
913fc6e8f5
|
国内外标准详情 分解单日期格式和条款名称模糊查询
|
2021-08-29 19:17:41 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
d66fcc1ad1
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-08-27 15:30:35 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
c22db5b063
|
定时任务-修改文本状态
|
2021-08-27 15:24:32 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
016e7e9003
|
修改预警时间
|
2021-08-27 11:29:15 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
bab79aec98
|
定时时间
|
2021-08-26 10:32:47 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
6e0091f875
|
标准预警
|
2021-08-26 10:23:02 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
426ff38355
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-08-26 10:22:15 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
a5ad8077d4
|
注释
|
2021-08-25 14:24:42 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
d5d885651b
|
新增自定义属性后,重新加载数据
|
2021-08-24 16:44:37 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
14b4a2f35c
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-08-24 16:03:08 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
083dd6aab5
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-08-24 16:02:33 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
1e2c09a610
|
预警显示的数据在系统日期之后
|
2021-08-24 16:02:18 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
52503aa715
|
解决了newListMethod() 新增标准清单添加标准问题
|
2021-08-23 13:15:52 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
c223de4c32
|
Merge remote-tracking branch 'origin/develop_1' into develop_3
|
2021-08-23 10:59:03 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
af0112e2dd
|
latest
|
2021-08-22 20:32:35 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
95e2316a99
|
海外标准法规-假设标准A的国家地区选择中国，国家地区清单tab页下的中国的清单里要自动归档标准A的数据
|
2021-08-21 23:28:54 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
ebfde8bd52
|
定时标准预警
|
2021-08-20 14:33:29 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
cec843270f
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-08-20 12:19:22 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
6c6d99f088
|
写了点注释
|
2021-08-19 16:42:10 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
01d0da14e8
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
# Conflicts:
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/entity/SarItemVO.java
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
# adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml
|
2021-08-18 16:42:28 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
8181d2f024
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-08-17 14:09:26 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
e6908fb48c
|
标准分解单 分页
|
2021-08-17 14:09:06 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
68d7a1ab66
|
添加了注释
|
2021-08-16 16:16:37 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
1acf15280e
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-08-16 16:13:17 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
32626f3ae1
|
过内外标准高级搜索
|
2021-08-16 16:13:04 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
41e2a80f2d
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-08-13 13:49:11 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
0142c3fe85
|
国内外标准排序
|
2021-08-13 13:48:42 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
2107728ce8
|
最新
|
2021-08-11 14:42:09 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
21b3158070
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-08-11 13:56:08 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
530a6febf6
|
查看分解单字段修改
|
2021-08-11 13:36:50 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
8a11249b07
|
最新
|
2021-08-10 20:21:22 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
7a51e1d9b4
|
标准详情->标准分解单查询 mapper<if>字符
|
2021-08-09 16:56:29 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
b0eeb87bd1
|
标准详情->标准分解单查询
|
2021-08-08 22:40:37 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
294866bb1e
|
修复了标准拆分--拆分页面，该页面的数据回显重复的问题
|
2021-08-03 14:28:47 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
bda7690807
|
最新
|
2021-07-31 22:29:40 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
d7a2285d75
|
Revert "最新"
This reverts commit 9f82519e
|
2021-07-30 16:26:27 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
d71c4a81e1
|
Revert "修复了收藏后重新编辑数据,收藏的数据没有更新问题"
This reverts commit 3154533fb8.
# Conflicts:
# adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
|
2021-07-30 16:25:23 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
3adc08d178
|
水印取消工号内容
|
2021-07-28 15:30:48 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
b98c8291bd
|
水印添加了时间
|
2021-07-28 09:07:48 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
66d54c3684
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-07-27 18:02:03 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
9f82519e1c
|
最新
|
2021-07-27 18:01:28 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
01126cc1d4
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-07-27 16:24:24 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
32afc5475f
|
Revert "修复了海外标准法规，配置标准后，在此节点没有显示此标准的问题"
This reverts commit 9cd93436
|
2021-07-27 16:18:58 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
b182ad5885
|
最新
|
2021-07-27 11:05:42 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
5bb3959002
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-07-27 10:43:17 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
1de5c838d0
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-07-27 09:34:43 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
b04e30f80d
|
修改了国外法规导出的excel表字段
|
2021-07-27 09:21:10 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
9d4600b96c
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-07-27 09:20:28 +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 |
|
|
zhaokaiyao@91isoft.com
|
9cd93436c4
|
修复了海外标准法规，配置标准后，在此节点没有显示此标准的问题
|
2021-07-26 20:07:38 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
6c4ad93812
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-07-26 10:10:24 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
2a41643617
|
只在pdf中添加水印
|
2021-07-26 10:10:14 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
f609e3cece
|
恢复下载时添加水印接口
|
2021-07-25 18:22:41 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
3154533fb8
|
修复了收藏后重新编辑数据,收藏的数据没有更新问题
优化逻辑,取消收藏时(逻辑删除),再次收藏此数据,由之前的添加一条新收藏的数据更改为更新原来数据的逻辑删除字段值
|
2021-07-25 16:51:59 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
a5286c3686
|
标准属性自定义在国外法规里新增字段
|
2021-07-25 16:46:36 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
66f9763b96
|
添加了修改第三方链接排序接口
|
2021-07-23 15:00:47 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
6c7baa65af
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-07-22 14:53:08 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
2ca543d981
|
添加岗位时,设置操作时间为当前系统时间
|
2021-07-22 14:52:11 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
b3f9244345
|
修改了国内法规导出excl表单的字段
|
2021-07-22 10:58:22 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
7618db7a47
|
("/${restPath}/person/personCollect")添加收藏,查询收藏,取消收藏
|
2021-07-21 15:18:58 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
706b6ce264
|
Merge remote-tracking branch 'origin/develop_3' into develop_3
|
2021-07-21 11:35:58 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
5825d8793f
|
修改了institutionAndUser(String userName)接口,当userName有值事搜索出此用户以及它所在的机构,userName为null时搜索全部
添加getNext(String institutionId)接口,通过机构id返回此部门下的第一级部门和人员
添加getFirstInstitution()接口,返回机构第一级目录
|
2021-07-21 11:30:44 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
4cee0f6bf5
|
修改了institutionAndUser(String userName)接口,当userName有值事搜索出此用户以及它所在的机构,userName为null时搜索全部
添加getNext(String institutionId)接口,通过机构id返回此部门下的第一级部门和人员
添加getFirstInstitution()接口,返回机构第一级目录
|
2021-07-21 10:03:49 +08:00 |
|