Mlin
|
72d2867244
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
2fdd604872
|
部门拖拽:分部优化
|
2 years ago |
 dxfeng
|
647f692920
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
04826fcaa4
|
组织管理，树结构展开功能完善
|
2 years ago |
|
Mlin
|
63491e9906
|
部门拖拽转移优化
|
2 years ago |
|
Mlin
|
315a67173d
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
32029788c4
|
部门拖拽转移
|
2 years ago |
|
dxfeng
|
9a6f0a845e
|
组织管理，架构图树排序、BUG修复
|
2 years ago |
|
dxfeng
|
ea4a3201aa
|
组织管理，架构图部门树选择数据接口
|
2 years ago |
|
dxfeng
|
e011880672
|
组织管理，树结构禁用非部门节点
|
2 years ago |
|
Mlin
|
50ee698cc2
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
1a307f9923
|
部门合并，名称占用释放
|
2 years ago |
|
dxfeng
|
59d4fac4e2
|
组织管理，部门封存传参，树结构优化
|
2 years ago |
|
dxfeng
|
29bfcdc418
|
组织管理，分部封存传参
|
2 years ago |
|
dxfeng
|
3fa679b139
|
组织管理，树结构兼容是否封存
|
2 years ago |
|
dxfeng
|
1280b3c6b9
|
组织管理，TreeSelect组件全量接口开发
|
2 years ago |
|
dxfeng
|
b1b24fc925
|
组织管理，移动树接口提交
|
2 years ago |
|
dxfeng
|
9610361733
|
组织管理，移动树接口提交
|
2 years ago |
|
dxfeng
|
87372be17f
|
组织管理，编制导入BUG修复
|
2 years ago |
|
dxfeng
|
46ecec4b17
|
组织管理，岗位台账、岗位浏览按钮列表展示优化
|
2 years ago |
|
dxfeng
|
fab01583ad
|
组织架构图，部门选择树
|
2 years ago |
|
dxfeng
|
f4c29de76b
|
新建编制信息初始化在编数
|
2 years ago |
|
Mlin
|
2ee38ccc0c
|
版本管理代码优化
|
2 years ago |
 Chengliang
|
d9e2a695cf
|
排序 时间轴
|
2 years ago |
|
Mlin
|
775405741a
|
版本管理，事务控制bug优化
|
2 years ago |
|
Mlin
|
0a809a29c9
|
版本管理，事务控制bug优化
|
2 years ago |
|
Mlin
|
1abbc7cddf
|
版本记录，未新增分部类型、部门类型字段时同步bug修复
|
2 years ago |
|
Mlin
|
7417cbac79
|
虚拟维度表查询bug修复
|
2 years ago |
|
Mlin
|
8ac0f45d29
|
版本记录，虚拟人员bug修复
|
2 years ago |
|
Mlin
|
3d7b5927b3
|
版本记录，虚拟人员bug修复
|
2 years ago |
|
Mlin
|
45b663217f
|
版本记录，分部bug修复
|
2 years ago |
|
Mlin
|
7d1b7b8795
|
版本记录，虚拟人员bug修复
|
2 years ago |
|
dxfeng
|
696f66ec98
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
d510f32bc5
|
组织架构图，BUG修复
|
2 years ago |
|
Chengliang
|
f5275c2148
|
v3
|
2 years ago |
|
Mlin
|
725d64888c
|
组织管理版本记录int类型bug修复
|
2 years ago |
|
Mlin
|
971b997dff
|
Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
# src/com/engine/organization/service/impl/ChartServiceImpl.java
|
2 years ago |
|
Mlin
|
10a9a350b4
|
组织管理版本记录数据同步
|
2 years ago |
|
dxfeng
|
62b25d6a65
|
组织架构图，回溯详细信息
|
2 years ago |
|
dxfeng
|
c61a071746
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
3bf299afa4
|
组织架构图，回溯详细信息
|
2 years ago |
|
Chengliang
|
81f7ecfec9
|
列表
|
2 years ago |
|
dxfeng
|
151e77e69b
|
组织架构图，回溯详细信息
|
2 years ago |
|
dxfeng
|
104d94ba6f
|
组织架构图，回溯数据查询
|
2 years ago |
|
dxfeng
|
775cf4a8ae
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
Mlin
|
6befb0de03
|
Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
# src/com/engine/organization/service/ChartService.java
# src/com/engine/organization/service/impl/ChartServiceImpl.java
|
2 years ago |
|
Mlin
|
38f3e457ef
|
组织管理版本记录0711
|
2 years ago |
|
Chengliang
|
1a188a1975
|
v3
|
2 years ago |
|
dxfeng
|
d4a6fb4a28
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
075456caa9
|
组织架构图，<根结点>添加回溯联动
|
2 years ago |
|
Chengliang
|
54abf562a4
|
v3
|
2 years ago |
|
liang.cheng
|
914649a35b
|
Merge pull request 'v3' (#185) from feature/cl into develop
Reviewed-on: #185
|
2 years ago |
|
Chengliang
|
688eeb125c
|
v3
|
2 years ago |
|
dxfeng
|
c023822ca5
|
组织架构图，兼容PG数据库
|
2 years ago |
|
dxfeng
|
a18e7a3dc7
|
组织架构图，添加部门层级条件
|
2 years ago |
|
dxfeng
|
eb28328219
|
组织架构图，岗位调整为查询聚才林岗位
|
2 years ago |
|
dxfeng
|
d9ea8fe266
|
修复并发情况下，岗位数据重复问题
|
2 years ago |
|
dxfeng
|
d2e1cacfa1
|
组织架构图，人员列表添加key
|
2 years ago |
|
dxfeng
|
7809f9ad3c
|
组织架构图，人员头像
|
2 years ago |
|
dxfeng
|
436decbc85
|
组织架构图，人员列表显示转换调整
|
2 years ago |
|
dxfeng
|
38656dde58
|
组织架构图，部门负责人、主次账号
|
2 years ago |
|
dxfeng
|
79f64f7f93
|
组织架构图，列表字段转换、卡片在岗数统计
|
2 years ago |
|
dxfeng
|
49036ba704
|
组织架构图，人员卡片
|
2 years ago |
|
dxfeng
|
603f7f606a
|
组织架构图，人员卡片
|
2 years ago |
|
dxfeng
|
5559a4322a
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
e760eae9a0
|
组织架构图，人员卡片
|
2 years ago |
|
Chengliang
|
9ffd5c3cfb
|
组织架构图
|
2 years ago |
|
Chengliang
|
2e58769c8b
|
组织架构图
|
2 years ago |
|
dxfeng
|
a2247ddb12
|
TODO注释清理
|
2 years ago |
|
dxfeng
|
c115308f9e
|
组织架构图重构-异步数据接口
|
2 years ago |
|
dxfeng
|
78c4aa5127
|
组织架构图重构-BUG修复
|
2 years ago |
|
dxfeng
|
c993cafab4
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
4e919dea65
|
组织架构图重构
|
2 years ago |
|
Chengliang
|
b963913d62
|
架构图
|
2 years ago |
|
Chengliang
|
2667ab8a60
|
修复条件
|
2 years ago |
|
Chengliang
|
53a295a468
|
虚拟组织暂存
|
2 years ago |
|
dxfeng
|
98b85ac75f
|
组织树添加key字段
|
2 years ago |
|
Chengliang
|
c696835a33
|
搜索条件修改
|
2 years ago |
|
dxfeng
|
e8d6f2ea73
|
组织架构图搜索条件优化
|
2 years ago |
|
dxfeng
|
0148d99314
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
Chengliang
|
35d7a045e2
|
组织架构图V3
|
2 years ago |
|
dxfeng
|
13c39d5fd0
|
Resin编译 异常、警告处理
|
2 years ago |
|
dxfeng
|
a1dd6126b0
|
岗位新增BUG修复
|
2 years ago |
|
dxfeng
|
cdd2e6384e
|
人员批量导入 BUG修复
|
2 years ago |
|
dxfeng
|
7889b866ab
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
2ec00b7bb3
|
聚才林岗位新增功能
|
2 years ago |
|
Mlin
|
f04216a113
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
6cea2706df
|
人员简历表格动态生成
|
2 years ago |
|
dxfeng
|
3a8aa2449a
|
兼容PostgreSQL,简历按钮BUG修复
|
2 years ago |
|
dxfeng
|
e138489c34
|
兼容PostgreSQL
|
2 years ago |
|
dxfeng
|
db990ce227
|
兼容PostgreSQL
|
2 years ago |
|
dxfeng
|
0ca51f58ae
|
花名册列表按钮权限优化
|
2 years ago |
|
Mlin
|
472cc4ab9a
|
人大金仓版本bug处理
|
2 years ago |
|
dxfeng
|
f8b60493f8
|
花名册人员状态查询功能优化
|
2 years ago |
|
dxfeng
|
f5f5c26133
|
人员身份证号码导入BUG修复
|
2 years ago |
|
dxfeng
|
2d63ca20a7
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
cb41ff1f8c
|
岗位浏览按钮SQL完善
|
2 years ago |
|
Mlin
|
41fdd36997
|
透视图在岗数bug修复
|
2 years ago |
|
dxfeng
|
453d4afe97
|
花名册查询、导出BUG修复
|
2 years ago |
|
dxfeng
|
4113df1708
|
简历树，聚才林岗位搜索BUG修复
|
2 years ago |
|
dxfeng
|
eaca9535d5
|
分部、部门导入BUG修复
|
2 years ago |
|
dxfeng
|
559ea407ab
|
岗位分权，部门列表BUG修复
|
2 years ago |
|
dxfeng
|
6ac651e8bd
|
花名册，状态查询功能完善
|
2 years ago |
|
dxfeng
|
ec7ff05616
|
列定制BUG修复
|
2 years ago |
|
dxfeng
|
37ded0a19b
|
列定制BUG修复
|
2 years ago |
|
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 |
