 dxfeng
|
8947e6da3a
|
列定制BUG修复
|
2 years ago |
|
dxfeng
|
5e40c18df1
|
列定制BUG修复
|
2 years ago |
Mlin
|
4b4754bd74
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
2b5acfeb32
|
花名册模板管理bug修复
|
2 years ago |
|
dxfeng
|
7dc6225356
|
Merge pull request 'BUG修复' (#145) from feature/dxf into develop
Reviewed-on: #145
|
2 years ago |
|
dxfeng
|
ba2909bac9
|
BUG修复
|
2 years ago |
|
Mlin
|
8ff8340d81
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
9d36b42da6
|
花名册模板管理日期优化
|
2 years ago |
|
dxfeng
|
0aac4a0c57
|
BUG修复
|
2 years ago |
|
dxfeng
|
ec55baf5fe
|
BUG修复
|
2 years ago |
|
dxfeng
|
6d8aaf063b
|
BUG修复
|
2 years ago |
|
Mlin
|
547264d755
|
花名册模板列定制优化20230113
|
2 years ago |
|
Mlin
|
78682a47c7
|
花名册模板列定制优化20230113
|
2 years ago |
|
Mlin
|
58d5bccddc
|
花名册模板列定制列名称获取优化20230113
|
2 years ago |
|
Mlin
|
07a82baf9c
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
5c44a11ff3
|
花名册模板列定制功能优化20230113
|
2 years ago |
|
dxfeng
|
1bb7b67133
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
1c9dce7c0b
|
BUG修复
|
2 years ago |
|
Mlin
|
2fba3b50b9
|
Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
# src/com/engine/organization/mapper/resource/HrmResourceMapper.xml
# src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
|
2 years ago |
|
Mlin
|
e3a78a05c7
|
花名册模板列定制20230113
|
2 years ago |
|
dxfeng
|
ebb4e88d0d
|
BUG修复
|
2 years ago |
|
dxfeng
|
f79ad8681f
|
BUG修复
|
2 years ago |
|
dxfeng
|
563070a539
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
15b14cf4b1
|
显示定制列穿梭框接口开发
|
2 years ago |
|
Mlin
|
a395024010
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
a677da06a6
|
花名册模板管理查询、编辑保存20230112
|
2 years ago |
|
dxfeng
|
cb814ef077
|
显示定制列穿梭框接口开发
|
2 years ago |
|
dxfeng
|
b93a3d7b1c
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
a7b1f33e1a
|
显示定制列穿梭框接口开发
|
2 years ago |
|
Mlin
|
044f963f31
|
Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
# src/com/engine/organization/service/HrmResourceService.java
# src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
# src/com/engine/organization/web/HrmResourceController.java
# src/com/engine/organization/wrapper/HrmResourceWrapper.java
|
2 years ago |
|
Mlin
|
8750850dfa
|
花名册列定制模板查询20230112
|
2 years ago |
|
Mlin
|
09d4dbddd5
|
花名册列定制模板查询20230112
|
2 years ago |
|
dxfeng
|
0f73f6e3ac
|
显示定制列穿梭框接口开发
|
2 years ago |
|
dxfeng
|
d5ca665f2f
|
显示定制列穿梭框接口开发
|
2 years ago |
|
Mlin
|
f86562c802
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
71c427d1ec
|
花名册自定义字段展示20230111
|
2 years ago |
|
dxfeng
|
4076a755f1
|
花名册高级搜索BUG修复
|
2 years ago |
|
Mlin
|
12bcd367c7
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
dxfeng
|
6e1f70ef82
|
花名册高级搜索BUG修复
|
2 years ago |
|
dxfeng
|
1d053a0437
|
花名册高级搜索BUG修复
|
2 years ago |
|
dxfeng
|
832fb2b9c4
|
花名册高级搜索BUG修复
|
2 years ago |
|
dxfeng
|
f7ce6b028a
|
花名册高级搜索BUG修复
|
2 years ago |
|
dxfeng
|
9dbce1e8c5
|
花名册高级搜索BUG修复
|
2 years ago |
|
dxfeng
|
4ba6d5c21e
|
花名册高级搜索BUG修复
|
2 years ago |
|
dxfeng
|
9e6cc7da2a
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
cfe08ddf4c
|
花名册动态查询SQL
|
2 years ago |
 Chengliang
|
07786bc2a6
|
花名册增加按钮
|
2 years ago |
|
dxfeng
|
01c042ebbc
|
高级搜索表单完善
|
2 years ago |
|
dxfeng
|
503697dd55
|
花名册高级搜索相关接口
|
2 years ago |
|
Mlin
|
1c3b1296b5
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
d1612a151a
|
花名册自定义字段展示20230106
|
2 years ago |
|
dxfeng
|
3e0d3a1b2e
|
花名册高级搜索相关接口
|
2 years ago |
|
dxfeng
|
4d43e0605b
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
92c51cfe18
|
花名册高级搜索相关接口
|
2 years ago |
|
Mlin
|
00ab437f9e
|
增加全部人员简历下载条件（去除离职）（20230106）
|
2 years ago |
|
Mlin
|
c7ce7ea540
|
优化人员简历目录删除问题（20230105）
|
2 years ago |
|
Mlin
|
0ef350c902
|
人员简历合并导出日志（20230105）
|
2 years ago |
|
Mlin
|
95a6b388c4
|
修复人员简历合并图片重复问题（20230105）
|
2 years ago |
|
Mlin
|
b515fdb78f
|
人员简历导出、压缩下载（20230105）
|
2 years ago |
|
Mlin
|
d81776680f
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
dxfeng
|
b2500cfbd0
|
人员筛选接口开发、调整
|
2 years ago |
|
Mlin
|
ab881b8d8f
|
Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
# src/com/engine/organization/service/PersonnelResumeService.java
# src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java
# src/com/engine/organization/web/PersonnelResumeController.java
# src/com/engine/organization/wrapper/PersonnelResumeWrapper.java
|
2 years ago |
|
Mlin
|
5450b99e37
|
人员简历导出下载（20230105）
|
2 years ago |
|
dxfeng
|
586330f99e
|
人员筛选接口开发、调整
|
2 years ago |
|
Mlin
|
06da61d889
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
6d1603aeb2
|
人员简历模板导出20230103
|
2 years ago |
|
dxfeng
|
bccae91e75
|
人员简历模板优化
|
2 years ago |
|
dxfeng
|
395d93067a
|
Oracle,SQL脚本BUG修复
|
2 years ago |
|
Mlin
|
90e6d7b765
|
Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
# src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java
# src/com/engine/organization/web/PersonnelResumeController.java
# src/com/engine/organization/wrapper/PersonnelResumeWrapper.java
|
2 years ago |
|
Mlin
|
a86a8dd2c8
|
人员简历模板导出
|
2 years ago |
|
Mlin
|
bc47f697d0
|
人员简历模板导出
|
2 years ago |
|
dxfeng
|
dde1d0d0db
|
人员简历相关接口开发
|
2 years ago |
|
dxfeng
|
687b580494
|
人员简历相关接口开发
|
2 years ago |
|
dxfeng
|
df57b4e71f
|
人员简历相关接口开发
|
2 years ago |
|
dxfeng
|
c41716318d
|
人员简历相关接口开发
|
2 years ago |
|
dxfeng
|
702092c5a2
|
人员简历相关接口开发
|
2 years ago |
|
dxfeng
|
ea22378df0
|
人员简历相关接口开发
|
2 years ago |
|
dxfeng
|
33e9073e1c
|
人员简历相关接口开发
|
2 years ago |
|
dxfeng
|
b53007b7c2
|
人员简历相关接口开发
|
2 years ago |
|
dxfeng
|
2e39235515
|
人员简历相关接口开发
|
2 years ago |
|
Mlin
|
950da74ac8
|
人员岗位显示bug修复
|
2 years ago |
|
Mlin
|
347e3505d1
|
多个部门负责人存入版本bug修复
|
2 years ago |
|
Mlin
|
7b9a82dda9
|
多部门负责人截取显示bug修复
|
2 years ago |
|
Mlin
|
4a0949b6b1
|
多部门负责人截取显示bug修复
|
2 years ago |
|
Mlin
|
18b50a4431
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
d231bf3bd3
|
多部门负责人截取显示
|
2 years ago |
|
dxfeng
|
8c6becc29c
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
Mlin
|
fbac015a99
|
部门转移岗位重复bug修复
|
2 years ago |
|
dxfeng
|
23eae34062
|
人员导出BUG
|
2 years ago |
|
dxfeng
|
a6ed99fc60
|
部门导入BUG修复
|
2 years ago |
|
Mlin
|
33106aaaec
|
sqlserver版本存入、部门转移
|
2 years ago |
|
dxfeng
|
b7938cfb6b
|
多部门负责人BUG修复
|
2 years ago |
|
dxfeng
|
4ca7eeb93c
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
665172325e
|
职等职级BUG修复
|
2 years ago |
|
Mlin
|
6dcb5db15f
|
动态字段查询
|
2 years ago |
|
dxfeng
|
a080ebea22
|
岗位浏览按钮BUG修复
|
2 years ago |
|
dxfeng
|
30bec2120a
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
31a26dec08
|
部门合并、转移。岗位同步BUG修复
|
2 years ago |
|
Mlin
|
b8158cdcec
|
oracle版数据同步问题
|
2 years ago |
|
dxfeng
|
ebf7a1bdda
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
e7cc13ed60
|
BUG修复
|
2 years ago |
|
Mlin
|
30898d0eee
|
oracle环境存入版本bug修复、新增职等职级1220
|
2 years ago |
|
Mlin
|
0128de79ea
|
oracle环境存入版本bug修复、新增职等职级1219
|
2 years ago |
|
dxfeng
|
2b0c1d0a69
|
BUG修复
|
2 years ago |
|
dxfeng
|
d21d3148bf
|
Oracle版本BUG修复
|
2 years ago |
|
Mlin
|
5bcd3e22fc
|
oracle环境存入版本bug修复1219
|
2 years ago |
|
Mlin
|
806d18e511
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
a5cc902c10
|
oracle环境存入版本bug修复
|
2 years ago |
|
dxfeng
|
b11251701a
|
BUG修复
|
2 years ago |
|
Mlin
|
afe4813427
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
78d08ea740
|
无历史版本返回为空
|
2 years ago |
|
dxfeng
|
c86e37495d
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
b9cfe839e7
|
BUG修复
|
2 years ago |
|
Mlin
|
78dfc87f61
|
同步数据接口
|
2 years ago |
|
Mlin
|
0b89abeaac
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
981ea3ad4a
|
存为版本取消存入map表，同步接口
|
2 years ago |
|
dxfeng
|
434dbacb64
|
根据职等职级字段，补充人员信息
|
2 years ago |
|
dxfeng
|
f428dff5a0
|
根据职等职级字段，补充人员信息
|
2 years ago |
|
Mlin
|
8cda66dc8b
|
bug修复
|
2 years ago |
|
Mlin
|
241bf47710
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
184a9e375f
|
版本查询接口二版
|
2 years ago |
|
liang.cheng
|
afa66c74c1
|
Merge pull request '岗位刷新功能' (#100) from feature/cl into develop
Reviewed-on: #100
|
2 years ago |
|
Mlin
|
95d53a6d8c
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
faaed265fe
|
版本查询接口初版
|
2 years ago |
|
Chengliang
|
4105600770
|
岗位刷新功能
|
2 years ago |
|
Chengliang
|
4d8948724e
|
岗位增加刷新按钮
|
2 years ago |
|
dxfeng
|
e26e780310
|
Merge pull request 'BUG修复' (#98) from feature/dxf into develop
Reviewed-on: #98
|
2 years ago |
|
dxfeng
|
1db4a85d46
|
BUG修复
|
2 years ago |
|
Mlin
|
569a3132c1
|
分部、部门、人员封存后取消架构图展示
|
2 years ago |
|
Mlin
|
3be6bf11a2
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
b3057e2f4e
|
版本查询接口
|
2 years ago |
|
Mlin
|
3462511603
|
showOrder类型小数转换
|
2 years ago |
|
dxfeng
|
550be7fb14
|
BUG修复
|
2 years ago |
|
Mlin
|
7f51135424
|
定时任务
|
2 years ago |
|
dxfeng
|
42545745fe
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
946354b32d
|
BUG修复
|
2 years ago |
|
Mlin
|
1db1949a94
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
43f00f7d9d
|
sqlserver存入版本修复、定时任务
|
2 years ago |
|
dxfeng
|
d2f6fa693a
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
4117a34928
|
BUG修复
|
2 years ago |
|
dxfeng
|
8383c08a06
|
BUG修复
|
2 years ago |
|
Mlin
|
9c80a74386
|
oracle、sqlserver查询版本语句(部门存入失败)
|
2 years ago |
|
dxfeng
|
b9d06b4246
|
分权功能版本回退，岗位BUG修复
|
2 years ago |
|
Mlin
|
5897ae1563
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
e81d8f4939
|
oracle、sqlserver查询版本语句
|
2 years ago |
|
dxfeng
|
fab4614cd5
|
分权功能重构，调用EC方法
|
2 years ago |
|
dxfeng
|
ce2c34cfdd
|
BUG修复,岗位关联关系调整
|
2 years ago |
|
dxfeng
|
32fd42db2f
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
b64f15bd83
|
BUG修复,岗位关联关系调整
|
2 years ago |
|
Mlin
|
2b549bcc4a
|
人员版本控制写入逻辑
|
2 years ago |
