 zhaokaiyao@91isoft.com
|
ed1762a7ec
|
标准发布日期查询
|
2021-10-21 18:25:14 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
0ee4f63614
|
项目清单->项目经理
|
2021-10-21 13:51:27 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
5c743e92c0
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-10-20 21:30:48 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
4b30022ae5
|
标准excl导入
|
2021-10-20 21:30:36 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
13332aaaa3
|
车型项目,PCMS组织信息,模块结构同步数据返回值修改,以及车型项目json重写
|
2021-10-20 21:30:02 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
4ebe597ed4
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
# Conflicts:
# adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java
|
2021-10-20 14:53:46 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
bef55f395a
|
TODO模块单元树结构
|
2021-10-20 14:52:07 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
f6508c6e1a
|
TODO标准excl导入
|
2021-10-20 14:51:05 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
7b87743f9f
|
TODO树形结构Hash
|
2021-10-20 14:49:51 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
ad91f84dfb
|
当前参数为标准类别时需要输入的code为name值
|
2021-10-20 14:33:21 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
d09cdb1d42
|
通过id绑定责任工程师和责任部门名称
|
2021-10-20 11:24:49 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
740db92f90
|
commit
|
2021-10-19 17:58:11 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
f74da3d65d
|
查询机构人员,模糊查询,不需要id
|
2021-10-19 17:21:12 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
8d522a4304
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-10-19 16:50:06 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
4d1876b8c4
|
岗位配置模糊查询分页
|
2021-10-19 16:49:48 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
6b914c1430
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-10-18 17:21:43 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
a125490d19
|
企业标准导出加入白名单
|
2021-10-18 17:21:22 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
60fd2eb999
|
抽出方法
|
2021-10-18 17:13:43 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
acbece6b2a
|
机构树形结构 不采用用递归查询数据库
|
2021-10-18 16:46:24 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
4286ae309c
|
标准excl导入
|
2021-10-17 19:59:00 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
7358e84b82
|
sql优化,保留标准类别 standSortShow
|
2021-10-17 19:50:47 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
dba0c2e86a
|
附件下载接口加入白名单
|
2021-10-17 18:43:31 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
b99983e910
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-10-17 18:41:13 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
b790264f77
|
导入标准信息excl导出工具
|
2021-10-17 18:40:53 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
785ef90acd
|
sql优化
|
2021-10-17 18:39:57 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
33254f05f8
|
模块结构单元,查询
|
2021-10-17 16:12:23 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
9b5bf72fad
|
文件后缀大写
|
2021-10-17 14:26:44 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
ffa894865c
|
接口拦截白名单
|
2021-10-15 14:48:38 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
8ef4f22e24
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-10-14 17:11:29 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
fec7245ec1
|
添加导出为excl 接口进白名单
|
2021-10-14 17:11:15 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
f1ef403e56
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-10-14 15:11:16 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
4e66ba832f
|
取消定时同步,手动同步加入白名单
|
2021-10-14 15:11:06 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
2caec798ad
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-10-14 14:41:07 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
b33d2da29d
|
定时用户同步,和组织机构同步
|
2021-10-14 14:40:54 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
38ad74e9ee
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-10-13 15:49:52 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
29ef5bafe3
|
commit temp
|
2021-10-13 15:39:37 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
a2866cf07e
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-10-13 14:59:12 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
503523115b
|
国内外标准->详情->关联模块
|
2021-10-13 14:48:02 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
36df1dc472
|
修改实体类属性类型
|
2021-10-08 14:53:28 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
b4ab5a8f43
|
comment
|
2021-10-08 14:52:46 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
81c44413fe
|
commit
|
2021-09-29 11:15:11 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
13c7c3a3d6
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-09-28 17:47:11 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
bf3412e488
|
海外标准导出,去除文本说明
|
2021-09-28 17:46:23 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
ff4456e3f7
|
标准拆分-编辑后更改标志未1
|
2021-09-28 17:19:24 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
d2870231ea
|
标准拆分-文件类型动态查询
|
2021-09-28 16:48:48 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
7e0d3b59b1
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-09-28 15:18:33 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
2c4ff91c4f
|
部门为"null"的数据不保存
|
2021-09-28 10:07:29 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
0a006671cc
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-09-28 09:04:52 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
4e2278a987
|
机构树形排序
|
2021-09-28 08:58:23 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
f3b8466c5f
|
同步用户空指针
|
2021-09-28 08:57:55 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
2991806086
|
联表查询 dicstandTextStatus
|
2021-09-27 14:05:51 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
3eed899c34
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-09-27 13:54:24 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
ce7812e704
|
把 standtextStatusShow改为了standTextStatusShow
|
2021-09-27 13:54:14 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
2556ddcc0b
|
在基础字段中去除了适用产品线和责任工程师 因为在attr中已存在
|
2021-09-27 13:39:43 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
fd2d58c25f
|
添加了连接查询文本状态显示值
|
2021-09-27 10:44:38 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
447d56231a
|
group by中添加字段dicstandNature.DIC_TYPE_NAME
|
2021-09-27 10:33:37 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
50a4b7284a
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-09-27 10:20:00 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
d9d5aeb284
|
标准导出
|
2021-09-27 10:18:26 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
5d1e39fa32
|
分解单->关联条款
|
2021-09-23 01:12:51 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
d4a293cbef
|
标准详情->分解单->排序split_pid函数
|
2021-09-22 16:26:02 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
76b61d5d07
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-09-17 09:32:25 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
7bc2d8124a
|
首页->标准发布->实施日期和发布日期比较时的日期格式
|
2021-09-17 09:31:52 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
e7e3848108
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-09-16 20:04:09 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
fe0a0f7dbe
|
国内外标准 实施日期排序 程序异常 group by问题
|
2021-09-16 20:03:40 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
ccf7d32945
|
首页标准发布 只查询文本状态为即将实施的数据
|
2021-09-16 19:27:36 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
3eb2ddce1e
|
分解单默认升序排序
|
2021-09-16 16:47:03 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
44ba80e050
|
解决了标准预警,条款预警标准号显示为null的问题
|
2021-09-16 10:48:19 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
dcc461e041
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-09-16 09:11:51 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
d6331ab155
|
标准详情,已被分解的的文本才有分解单按钮
|
2021-09-15 18:01:06 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
180b755bec
|
分解单排序
|
2021-09-15 17:07:37 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
93fed98d3e
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-09-14 15:42:43 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
33d084527b
|
导入文件路径 摒弃配置
|
2021-09-14 15:42:35 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
45da8e58d3
|
导入文件路径 摒弃配置设置
|
2021-09-14 15:11:58 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
b0c0a22906
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-09-14 15:09:16 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
aae27284b8
|
导入文件路径
|
2021-09-14 15:09:06 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
d133fefdab
|
注释
|
2021-09-13 16:09:32 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
3f9e7205fd
|
使用标准表实施日期,不使用国家清单实施日期
|
2021-09-13 16:05:26 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
dd247c2caf
|
企标英文名称模糊查询
|
2021-09-13 15:06:07 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
200adfcc65
|
导入数据时,标准类别不存在时新增
|
2021-09-13 09:06:47 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
fe072412d9
|
属性字段初始化
|
2021-09-10 17:40:29 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
61be8c0aaa
|
excl批量导入标准 添加搜索中心
|
2021-09-10 15:59:10 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
ea9e2b31cc
|
excl批量导入标准
|
2021-09-09 23:06:19 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
77c274b724
|
commit
|
2021-09-09 22:29:34 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
6cf59f9a45
|
暴力UNION 去重
|
2021-09-09 22:05:41 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
3c5c0e4847
|
详情,实施日期多个
|
2021-09-09 21:04:04 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
6aad71715c
|
commit
|
2021-09-09 19:44:48 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
a69f009002
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-09-09 19:42:15 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
346f35f548
|
预警 再实施日期到达预警期限时,新车型和在产车实施日期不在预警期限,取消不显示
|
2021-09-09 19:39:01 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
bc4cc05f24
|
标准左侧数排序
|
2021-09-09 17:56:39 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
5089cbb59d
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-09-09 17:25:45 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
292d4c3823
|
标准号使用正则判断
|
2021-09-09 17:25:02 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
60e28c19dc
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-09-09 10:59:42 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
0cdf343a09
|
standRegionalTimeDto 字段与数据库字段匹配
|
2021-09-09 10:59:26 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
1d915c30d2
|
自定义属性字段没有数据时,返回了null
|
2021-09-08 22:48:22 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
26f28b30b6
|
standRegionalTimeDto 属性大小写和数据字段匹配
|
2021-09-08 22:26:09 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
ebff8a9a74
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-09-08 21:09:10 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
cf32ad9580
|
标准详情,实施日期 s.getPutTime()空指针
|
2021-09-08 21:07:29 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
7fab612a90
|
Merge remote-tracking branch 'origin/develop_master' into develop_3
|
2021-09-08 10:18:42 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
1a03cfe68f
|
标准文本状态.解决无法自动废止
|
2021-09-08 10:17:48 +08:00 |
|
|
zhaokaiyao@91isoft.com
|
7ede6c69af
|
commit
|
2021-09-07 09:24:41 +08:00 |
|