 dxfeng
|
15b14cf4b1
|
显示定制列穿梭框接口开发
|
3 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
|
3 years ago |
|
Mlin
|
8750850dfa
|
花名册列定制模板查询20230112
|
3 years ago |
|
Mlin
|
09d4dbddd5
|
花名册列定制模板查询20230112
|
3 years ago |
|
dxfeng
|
0f73f6e3ac
|
显示定制列穿梭框接口开发
|
3 years ago |
|
dxfeng
|
d5ca665f2f
|
显示定制列穿梭框接口开发
|
3 years ago |
|
Mlin
|
12bcd367c7
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
3 years ago |
|
dxfeng
|
832fb2b9c4
|
花名册高级搜索BUG修复
|
3 years ago |
|
dxfeng
|
f7ce6b028a
|
花名册高级搜索BUG修复
|
3 years ago |
|
dxfeng
|
cfe08ddf4c
|
花名册动态查询SQL
|
3 years ago |
|
dxfeng
|
01c042ebbc
|
高级搜索表单完善
|
3 years ago |
|
Mlin
|
1c3b1296b5
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
3 years ago |
|
Mlin
|
d1612a151a
|
花名册自定义字段展示20230106
|
3 years ago |
|
dxfeng
|
3e0d3a1b2e
|
花名册高级搜索相关接口
|
3 years ago |
|
dxfeng
|
4d43e0605b
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
92c51cfe18
|
花名册高级搜索相关接口
|
3 years ago |
|
Mlin
|
b515fdb78f
|
人员简历导出、压缩下载（20230105）
|
3 years ago |
|
dxfeng
|
586330f99e
|
人员筛选接口开发、调整
|
3 years ago |
|
dxfeng
|
c41716318d
|
人员简历相关接口开发
|
3 years ago |
|
dxfeng
|
702092c5a2
|
人员简历相关接口开发
|
3 years ago |
|
dxfeng
|
ea22378df0
|
人员简历相关接口开发
|
3 years ago |
|
dxfeng
|
33e9073e1c
|
人员简历相关接口开发
|
3 years ago |
|
dxfeng
|
b53007b7c2
|
人员简历相关接口开发
|
3 years ago |
|
dxfeng
|
2e39235515
|
人员简历相关接口开发
|
3 years ago |
|
Mlin
|
347e3505d1
|
多个部门负责人存入版本bug修复
|
3 years ago |
|
dxfeng
|
b7938cfb6b
|
多部门负责人BUG修复
|
3 years ago |
|
Mlin
|
30898d0eee
|
oracle环境存入版本bug修复、新增职等职级1220
|
3 years ago |
|
Mlin
|
a5cc902c10
|
oracle环境存入版本bug修复
|
3 years ago |
|
dxfeng
|
b9cfe839e7
|
BUG修复
|
3 years ago |
 liang.cheng
|
afa66c74c1
|
Merge pull request '岗位刷新功能' (#100) from feature/cl into develop
Reviewed-on: #100
|
3 years ago |
|
Mlin
|
95d53a6d8c
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
3 years ago |
|
Mlin
|
faaed265fe
|
版本查询接口初版
|
3 years ago |
|
Chengliang
|
4105600770
|
岗位刷新功能
|
3 years ago |
|
dxfeng
|
e26e780310
|
Merge pull request 'BUG修复' (#98) from feature/dxf into develop
Reviewed-on: #98
|
3 years ago |
|
dxfeng
|
1db4a85d46
|
BUG修复
|
3 years ago |
|
Mlin
|
b3057e2f4e
|
版本查询接口
|
3 years ago |
|
Mlin
|
7f51135424
|
定时任务
|
3 years ago |
|
dxfeng
|
946354b32d
|
BUG修复
|
3 years ago |
|
dxfeng
|
4117a34928
|
BUG修复
|
3 years ago |
|
dxfeng
|
b9d06b4246
|
分权功能版本回退，岗位BUG修复
|
3 years ago |
|
dxfeng
|
fab4614cd5
|
分权功能重构，调用EC方法
|
3 years ago |
|
dxfeng
|
ce2c34cfdd
|
BUG修复,岗位关联关系调整
|
3 years ago |
|
dxfeng
|
6169b007ae
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
Mlin
|
1bdc7e2fa4
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
3 years ago |
|
Mlin
|
13ae136872
|
部门版本控制写入逻辑
|
3 years ago |
|
dxfeng
|
45a24cb0be
|
BUG修复,岗位关联关系调整
|
3 years ago |
|
dxfeng
|
06c9912d21
|
BUG修复,岗位关联关系调整
|
3 years ago |
|
dxfeng
|
dee6bb25b5
|
岗位关联关系调整
|
3 years ago |
|
dxfeng
|
3470ba04cd
|
岗位关联关系调整
|
3 years ago |
|
Mlin
|
73dbaf75ac
|
分部版本控制写入逻辑
|
3 years ago |
|
dxfeng
|
c1c812596d
|
BUG修复
|
3 years ago |
|
dxfeng
|
f89ebdb965
|
分部、部门联调。BUG修复
|
3 years ago |
|
dxfeng
|
a1f2c9d1ac
|
BUG修复
|
3 years ago |
|
dxfeng
|
de03ca3b8b
|
部门列表BUG修复
|
3 years ago |
|
dxfeng
|
3477539393
|
部门列表BUG修复
|
3 years ago |
|
dxfeng
|
324881794b
|
分部导入新增、更新
|
3 years ago |
|
dxfeng
|
54c3676c07
|
分部BUG修复，导入接口逻辑重写
|
3 years ago |
|
dxfeng
|
85ec966813
|
人员卡片查看页面逻辑重写
|
3 years ago |
|
dxfeng
|
bd33075e14
|
部门管理功能逻辑调整
|
3 years ago |
|
dxfeng
|
40a6540a1d
|
部门管理功能逻辑调整
|
3 years ago |
|
dxfeng
|
238d8e6f75
|
部门接口逻辑调整
|
3 years ago |
|
dxfeng
|
9a2eabc8bd
|
部门切换数据源、实体类更新
|
3 years ago |
|
dxfeng
|
aa3d0742ff
|
分部接口整理、代码优化
|
3 years ago |
|
dxfeng
|
416471a283
|
分部列表、新增、删除、转移功能重写
|
3 years ago |
|
dxfeng
|
7d1fc84fad
|
组织架构树排序、人员卡片BUG修复
|
3 years ago |
|
dxfeng
|
17f4789e33
|
BUG修复
|
3 years ago |
|
dxfeng
|
67fd2df4f9
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
Chengliang
|
cb4db723e4
|
“栏目表格修复”
|
3 years ago |
|
dxfeng
|
05364f9265
|
BUG修复
|
3 years ago |
|
dxfeng
|
4fc2eca27b
|
花名册树、角色展示BUG
|
3 years ago |
|
dxfeng
|
7c79718d6e
|
人员卡片，修改字段名
|
3 years ago |
|
dxfeng
|
3ec8afe78b
|
人员卡片，明细表展示
|
3 years ago |
|
dxfeng
|
7b5a4905dc
|
BUG修复、卡片按钮排序
|
3 years ago |
|
dxfeng
|
16794bf98c
|
人员卡片按钮保存
|
3 years ago |
|
dxfeng
|
57d788d807
|
人员卡片按钮权限
|
3 years ago |
|
Chengliang
|
eeefde07ed
|
接口
|
3 years ago |
|
dxfeng
|
466ba43b31
|
人员卡片类别展示权限控制
|
3 years ago |
|
dxfeng
|
a6952f41b0
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
b0021dae20
|
字段允许个人修改
|
3 years ago |
|
liang.cheng
|
c2a1908c10
|
Merge pull request 'bug修复' (#44) from feature/cl into develop
Reviewed-on: #44
|
3 years ago |
|
Chengliang
|
99f849f350
|
bug修复
|
3 years ago |
|
dxfeng
|
a3a0ce8046
|
岗位按钮、人员字段权限
|
3 years ago |
|
dxfeng
|
c03a7c599a
|
岗位按钮、组织架构图 BUG修复
|
3 years ago |
|
Chengliang
|
afcbbcefb1
|
人员卡片权限接口
|
3 years ago |
|
liang.cheng
|
121927dba8
|
Merge pull request '人员卡片类型权限' (#35) from feature/cl into develop
Reviewed-on: #35
|
3 years ago |
|
Chengliang
|
b636dc2b82
|
人员卡片类型权限
|
3 years ago |
|
liang.cheng
|
ac5eb30534
|
Merge pull request '人员卡片权限' (#33) from feature/cl into develop
Reviewed-on: #33
|
3 years ago |
|
Chengliang
|
4e4cf54f8a
|
人员卡片权限
|
3 years ago |
|
dxfeng
|
895528617b
|
分部、部门、岗位、人员 分权功能开发
|
3 years ago |
|
dxfeng
|
0b3cd0641b
|
分权开发
|
3 years ago |
|
liang.cheng
|
19cccb9345
|
Merge pull request 'feature/detach' (#29) from feature/detach into develop
Reviewed-on: #29
|
3 years ago |
|
dxfeng
|
3989161281
|
组织架构图相关BUG修复
|
3 years ago |
|
Chengliang
|
ef392f4d0a
|
模块管理分权
|
3 years ago |
|
Chengliang
|
f6ea4425cf
|
模块管理分权
|
3 years ago |
|
Chengliang
|
4c74b583bf
|
模块管理分权
|
3 years ago |
|
Chengliang
|
2b975e6636
|
模块管理分权中心接口
|
3 years ago |
|
dxfeng
|
679c77f732
|
组织架构图相关BUG修复
|
3 years ago |
|
dxfeng
|
b2fc9d3e0c
|
人员编号、岗位部门、自定义下拉框BUG修复
|
3 years ago |
|
dxfeng
|
dca18ea5b1
|
编制导入模板、人员卡片、组织架构图Oracle
|
3 years ago |
|
dxfeng
|
2515121d83
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
11a4a85ff1
|
人员关联调整
|
3 years ago |
‘ml’
|
05fe14b5e1
|
分部转移、部门转移、岗位合并修复1021
|
3 years ago |
|
dxfeng
|
b7e34c1d31
|
人员关联调整
|
3 years ago |
|
dxfeng
|
eb007f5b23
|
人事卡片BUG修复
|
3 years ago |
|
‘ml’
|
5005243758
|
部门合并在岗数优化
|
3 years ago |
|
dxfeng
|
63b6b88a96
|
人员管理BUG修复
|
3 years ago |
|
dxfeng
|
cd4d2c77bf
|
人员卡片BUG修复
|
3 years ago |
|
dxfeng
|
c538a6205f
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
3ac7c2b959
|
聚才林花名册
|
3 years ago |
|
dxfeng
|
f26159506a
|
岗位浏览按钮、编制action BUG修复
|
3 years ago |
|
Chengliang
|
eb5578fd64
|
编制删除
|
3 years ago |
|
dxfeng
|
231addfda1
|
人事卡片接口开发
|
3 years ago |
|
dxfeng
|
c6fb0d129b
|
组织架构图编制、在岗,数据优化
|
3 years ago |
|
dxfeng
|
106d7e8bb8
|
更新人员、编制 同步组织架构图
|
3 years ago |
|
dxfeng
|
fe668c37e7
|
BUG修复
|
3 years ago |
|
dxfeng
|
35439a442f
|
BUG 修复
|
3 years ago |
|
dxfeng
|
34d44b6c91
|
部门复制
|
3 years ago |
|
dxfeng
|
8e385537da
|
BUG修复
|
3 years ago |
|
dxfeng
|
f6c41a3467
|
部门合并重写
|
3 years ago |
|
Chengliang
|
c280c5f908
|
fixed
|
3 years ago |
|
dxfeng
|
6765fd8fc4
|
左侧树排序
|
3 years ago |
|
dxfeng
|
278d61c499
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
Chengliang
|
3e06077e2a
|
fixed
|
3 years ago |
|
dxfeng
|
6c04ffd384
|
编制管理
|
3 years ago |
|
dxfeng
|
6415ee3eb7
|
编制方案
|
3 years ago |
|
dxfeng
|
b1b2a9a88a
|
部门管理，更新为EC
|
3 years ago |
|
dxfeng
|
4fa38f704c
|
分部管理，更新为EC
|
3 years ago |
|
Chengliang
|
0ffb0bac33
|
fix
|
3 years ago |
|
Chengliang
|
f5fcbdaff8
|
列表宽度顺序调整
|
3 years ago |
|
reset
|
385ff8331e
|
!220 fixed
Merge pull request !220 from reset/feature/cl
|
3 years ago |
|
Chengliang
|
3eb29f823f
|
fixed
|
3 years ago |
|
dxfeng
|
09d624b46b
|
!219 触发器、非标开关
Merge pull request !219 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
b49a25742a
|
触发器、非标开关
|
3 years ago |
|
Chengliang
|
80d3202c70
|
fixed
|
3 years ago |
|
dxfeng
|
1f7f299368
|
分部、部门、岗位触发器
|
3 years ago |
|
dxfeng
|
2744f85eff
|
BUG修复
|
3 years ago |
|
Chengliang
|
6bfc6eae27
|
人员信息管理
|
3 years ago |
|
Chengliang
|
ca7d34a5bd
|
人员信息模块
|
3 years ago |
|
reset
|
776d60674b
|
!207 fixed
Merge pull request !207 from reset/feature/cl
|
3 years ago |
|
Chengliang
|
8043012b41
|
人基础员信息
|
3 years ago |
|
dxfeng
|
07dabf46a0
|
BUG修复
|
3 years ago |
|
dxfeng
|
477a2f3bce
|
自定义字段BUG修复
|
3 years ago |
|
dxfeng
|
3acec4730d
|
BUG修复，权限控制
|
3 years ago |
|
dxfeng
|
05c24b5e98
|
Oracle BUG修复
|
3 years ago |
|
dxfeng
|
f27612db94
|
Oracle BUG修复
|
3 years ago |
|
dxfeng
|
6576335c6c
|
BUG修复
|
3 years ago |
|
dxfeng
|
36ce009929
|
非标脚本完善，BUG修复
|
3 years ago |
|
dxfeng
|
1c9b1abe69
|
编制方案需求完善
|
3 years ago |
|
dxfeng
|
7b88ba5a78
|
编制方案需求完善
|
3 years ago |
|
dxfeng
|
46ab51ee18
|
人员导入、CusFieldData触发器调整
|
3 years ago |
