 Chengliang
|
4c74b583bf
|
模块管理分权
|
3 years ago |
 dxfeng
|
92b246b5d5
|
组织架构图相关BUG修复
|
3 years ago |
|
dxfeng
|
679c77f732
|
组织架构图相关BUG修复
|
3 years ago |
|
dxfeng
|
b2fc9d3e0c
|
人员编号、岗位部门、自定义下拉框BUG修复
|
3 years ago |
‘ml’
|
f2c5d1227b
|
分部、部门、岗位禁用、合并修复1025
|
3 years ago |
|
‘ml’
|
f30998351f
|
Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
# src/com/engine/organization/thread/CompanyTriggerRunnable.java
# src/com/engine/organization/thread/DepartmentTriggerRunnable.java
|
3 years ago |
|
‘ml’
|
65ccecce56
|
分部、部门、岗位禁用修复1024
|
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 |
|
‘ml’
|
9a9b79cff0
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
3 years ago |
|
‘ml’
|
a0660a7857
|
分部转移、部门转移、岗位合并修复1020
|
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
|
396a4570d0
|
BUG修复
|
3 years ago |
|
dxfeng
|
f36756e1fd
|
分部、岗位 禁用功能限制
|
3 years ago |
|
dxfeng
|
f9c33da655
|
人员管理完善
|
3 years ago |
|
dxfeng
|
46068ab008
|
编制Action 添加提示信息，BUG修复
|
3 years ago |
|
dxfeng
|
f26159506a
|
岗位浏览按钮、编制action BUG修复
|
3 years ago |
|
dxfeng
|
9df3349715
|
兼容EC岗位名称重复
|
3 years ago |
|
dxfeng
|
231addfda1
|
人事卡片接口开发
|
3 years ago |
|
dxfeng
|
284f778963
|
人员调整,在岗数关联优化
|
3 years ago |
|
dxfeng
|
acee0bad51
|
人员调整,在岗数关联优化
|
3 years ago |
|
dxfeng
|
c6fb0d129b
|
组织架构图编制、在岗,数据优化
|
3 years ago |
|
dxfeng
|
02836ce37d
|
岗位名称校验、编制展示优化、BUG修复
|
3 years ago |
|
dxfeng
|
92d9a17d8c
|
组织架构图编制显示优化
|
3 years ago |
|
dxfeng
|
106d7e8bb8
|
更新人员、编制 同步组织架构图
|
3 years ago |
|
dxfeng
|
a847a4efef
|
兼容Oracle,达梦
|
3 years ago |
|
dxfeng
|
8a9370ee9e
|
BUG修复
|
3 years ago |
|
dxfeng
|
2632f6c857
|
BUG修复
|
3 years ago |
|
dxfeng
|
fe668c37e7
|
BUG修复
|
3 years ago |
|
dxfeng
|
35439a442f
|
BUG 修复
|
3 years ago |
|
dxfeng
|
5c66744468
|
部门合并、组织导入
|
3 years ago |
|
dxfeng
|
f6c41a3467
|
部门合并重写
|
3 years ago |
|
dxfeng
|
34af4f95c9
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
79c5f94862
|
导入问题处理
|
3 years ago |
|
dxfeng
|
120b4efdba
|
不同等级方案、编号可重复
|
3 years ago |
|
Chengliang
|
ba0b31f086
|
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
|
819a053aa3
|
fixed
|
3 years ago |
|
dxfeng
|
b49a25742a
|
触发器、非标开关
|
3 years ago |
|
dxfeng
|
1f7f299368
|
分部、部门、岗位触发器
|
3 years ago |
|
dxfeng
|
56ed6aa197
|
BUG修复
|
3 years ago |
|
dxfeng
|
21dc07dd40
|
BUG修复
|
3 years ago |
|
dxfeng
|
b6caffc74f
|
人员信息分类 删除接口
|
3 years ago |
|
dxfeng
|
2744f85eff
|
BUG修复
|
3 years ago |
|
dxfeng
|
6351109b79
|
人员信息分类
|
3 years ago |
|
dxfeng
|
f82e679837
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
8968e44e09
|
分部、部门、岗位同步EC重写
|
3 years ago |
|
Chengliang
|
6bfc6eae27
|
人员信息管理
|
3 years ago |
|
Chengliang
|
ca7d34a5bd
|
人员信息模块
|
3 years ago |
|
dxfeng
|
564b30eed8
|
BUG修复
|
3 years ago |
|
dxfeng
|
477a2f3bce
|
自定义字段BUG修复
|
3 years ago |
|
dxfeng
|
ff8660a586
|
BUG修复
|
3 years ago |
|
dxfeng
|
3acec4730d
|
BUG修复，权限控制
|
3 years ago |
|
dxfeng
|
e4d9d80fee
|
兼容Oracle
|
3 years ago |
|
dxfeng
|
1318fc1aba
|
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
|
08a9ab7b0d
|
BUG修复
|
3 years ago |
|
dxfeng
|
1c9b1abe69
|
编制方案需求完善
|
3 years ago |
|
dxfeng
|
7b88ba5a78
|
编制方案需求完善
|
3 years ago |
|
dxfeng
|
46ab51ee18
|
人员导入、CusFieldData触发器调整
|
3 years ago |
|
dxfeng
|
ceba6b5d62
|
BUG修复
|
3 years ago |
|
dxfeng
|
0a47b3548d
|
人员导入
|
3 years ago |
|
dxfeng
|
d5447c8e59
|
岗位导入
|
3 years ago |
|
dxfeng
|
fc8aaf7729
|
部门导入、日志记录
|
3 years ago |
|
dxfeng
|
b1365da225
|
分部导入
|
3 years ago |
|
dxfeng
|
9d304b0303
|
分部导入
|
3 years ago |
|
dxfeng
|
56a697d4e4
|
BUG 修复
|
3 years ago |
|
dxfeng
|
b8adf9ab7b
|
岗位模块操作同步EC
|
3 years ago |
|
dxfeng
|
15c9ef7e61
|
分部、部门 添加UUID列;部门表结构更新
|
3 years ago |
|
dxfeng
|
e217ecbe16
|
分部更新EC
|
3 years ago |
|
dxfeng
|
b52bb93dfa
|
人员拓展卡片、分部更新EC
|
3 years ago |
|
dxfeng
|
81fcd96af6
|
人员拓展卡片
|
3 years ago |
|
dxfeng
|
7103eb0c73
|
记录操作日志
|
3 years ago |
|
dxfeng
|
40a7c066a2
|
记录操作日志
|
3 years ago |
|
dxfeng
|
f5d95fabb2
|
记录操作日志
|
3 years ago |
|
dxfeng
|
033e90aa34
|
操作日志
|
3 years ago |
|
dxfeng
|
03f59d55d0
|
人员列表查询系统表 异常信息处理
|
3 years ago |
|
dxfeng
|
5291c3b855
|
分部列表BUG修复
|
3 years ago |
|
dxfeng
|
fca0bb4dad
|
人员导入
|
3 years ago |
|
dxfeng
|
d508a4d9d0
|
人员导入，日志表结构
|
3 years ago |
|
reset
|
be94ae88e7
|
!129 1
Merge pull request !129 from reset/feature/cl
|
3 years ago |
|
Chengliang
|
5445e6bfac
|
导出和批量导出完成
|
3 years ago |
|
Chengliang
|
300ccd6d77
|
“导出修改”
|
3 years ago |
|
dxfeng
|
48171c7e82
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
Chengliang
|
783b9fc6bf
|
人员导出
|
3 years ago |
|
dxfeng
|
5ceb8ae068
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
ff06d705e7
|
人员导入
|
3 years ago |
|
dxfeng
|
2fb33877f5
|
人员导入
|
3 years ago |
|
Chengliang
|
0ad6157c26
|
人员导出功能
|
3 years ago |
|
dxfeng
|
d0ea50cec5
|
部门、岗位 合并
|
3 years ago |
|
dxfeng
|
15131186de
|
分部、部门、岗位列表排序
|
3 years ago |
|
dxfeng
|
6c40245b02
|
组织人事测试、优化
|
3 years ago |
|
dxfeng
|
de1d4a8944
|
组织人事测试、优化
|
3 years ago |
|
dxfeng
|
f035662fb6
|
组织人事测试、优化
|
3 years ago |
|
dxfeng
|
eeb8c47451
|
组织人事测试、优化
|
3 years ago |
|
dxfeng
|
f72db1b5f9
|
组织人事测试、优化
|
3 years ago |
|
dxfeng
|
187be45bdf
|
人员管理：左侧树、列表接口
|
3 years ago |
|
dxfeng
|
b8f866e28b
|
人员树接口
|
3 years ago |
|
dxfeng
|
abf99aaa51
|
BUG修复
|
3 years ago |
|
dxfeng
|
2af1fb6336
|
移动到组
|
3 years ago |
|
dxfeng
|
6df1accb98
|
BUG 修复
|
3 years ago |
|
dxfeng
|
20bafffd2f
|
BUG 修复
|
3 years ago |
|
dxfeng
|
caff3332ce
|
BUG 修复
|
3 years ago |
|
dxfeng
|
fdf2572654
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
Conflicts:
src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml
|
3 years ago |
|
dxfeng
|
e9aa68229d
|
表结构更新
|
3 years ago |
|
dxfeng
|
445507d10d
|
表结构更新
|
3 years ago |
|
Chengliang
|
b60a335a1c
|
新增类型修改
|
3 years ago |
|
dxfeng
|
eb9c77b2d0
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
Conflicts:
src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java
src/com/engine/organization/web/FieldDefinedController.java
src/com/engine/organization/wrapper/FieldDefinedWrapper.java
|
3 years ago |
|
Chengliang
|
6d4448ec51
|
子信息维护
|
3 years ago |
|
dxfeng
|
4d2a70ad5d
|
自定义字段列表接口
|
3 years ago |
|
dxfeng
|
52c964f199
|
添加自定义字段接口
|
3 years ago |
|
dxfeng
|
e588fb0c96
|
BUG修复
|
3 years ago |
|
dxfeng
|
3f151d55e6
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
Conflicts:
src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java
src/com/engine/organization/service/FieldDefinedService.java
src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java
src/com/engine/organization/web/FieldDefinedController.java
src/com/engine/organization/wrapper/FieldDefinedWrapper.java
|
3 years ago |
|
dxfeng
|
7c02e9bc61
|
分组删除 新增自定义字段
|
3 years ago |
|
Chengliang
|
f4f7038611
|
新增编辑类型
|
3 years ago |
|
dxfeng
|
b4b54fa1e1
|
分组维护 新建分组
|
3 years ago |
|
dxfeng
|
079addd6c7
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
Conflicts:
src/com/engine/organization/service/FieldDefinedService.java
src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java
|
3 years ago |
|
dxfeng
|
a7e5619097
|
细化分组、标题、名字表是否启用；
明细表按照上下级关系展示。
|
3 years ago |
|
reset
|
6e7c76ac0d
|
!78 自定义设置页面树
Merge pull request !78 from reset/feature/cl
|
3 years ago |
|
Chengliang
|
6b1ce95b48
|
自定义设置页面树
|
3 years ago |
|
dxfeng
|
9259596e54
|
自定义字段 getTabInfo
|
3 years ago |
|
dxfeng
|
5b0864d503
|
添加字段分组表
|
3 years ago |
|
dxfeng
|
2ed79cc994
|
添加字段分组表
|
3 years ago |
|
Chengliang
|
fadd2577cb
|
修改注释
|
3 years ago |
|
dxfeng
|
3a075f4ec6
|
公司/分部 主表、拓展表动态添加字段、动态分组
|
3 years ago |
|
dxfeng
|
49155c6893
|
公司/分部 主表、拓展表动态添加字段、动态分组
|
3 years ago |
|
dxfeng
|
9877308b84
|
编制上报 编制变更
|
3 years ago |
|
dxfeng
|
77d27801b4
|
编制上报 编制变更
|
3 years ago |
|
dxfeng
|
d53365aba3
|
自动生成编号
|
3 years ago |
|
dxfeng
|
ec71f31859
|
部门联查岗位
|
3 years ago |
|
dxfeng
|
96e8042156
|
部门合并、转移
|
3 years ago |
|
dxfeng
|
076d099715
|
部门BUG修复
|
3 years ago |
|
dxfeng
|
5252770a61
|
部门复制
|
3 years ago |
|
dxfeng
|
5b2ab89a06
|
!42 被引用数据勾选框状态、按钮显隐
Merge pull request !42 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
ad70d2e3d4
|
被引用数据勾选框状态、按钮显隐
|
3 years ago |
|
dxfeng
|
796bdfa10f
|
!38 岗位模块功能完善
Merge pull request !38 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
6550e05a69
|
岗位模块功能完善
|
3 years ago |
|
Chengliang
|
aa3d3fad48
|
编号管理
|
3 years ago |
|
dxfeng
|
8c348f2061
|
岗位模块BUG修复
|
3 years ago |
|
dxfeng
|
03e0f6ee60
|
包名更改
|
3 years ago |
|
dxfeng
|
91c4116529
|
职务管理模块开发
|
3 years ago |
|
dxfeng
|
92953661ff
|
部门、岗位接口开发；代码合并
|
3 years ago |
|
dxfeng
|
33f5ec9458
|
部门、岗位接口开发；代码合并
|
3 years ago |
|
dxfeng
|
1ae3dcdec0
|
11
|
3 years ago |
|
dxfeng
|
4102c56e7c
|
!23 编制表接口 表结构更新
Merge pull request !23 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
b18133f790
|
编制表接口 表结构更新
|
3 years ago |
|
Chengliang
|
c3395b6509
|
联查部门修改
|
3 years ago |
|
dxfeng
|
b212122007
|
公司/分部BUG修复 编制方案接口
|
3 years ago |
|
dxfeng
|
477df79cd1
|
分部列表分页 明细表字段展示 BUG修复
|
3 years ago |
|
dxfeng
|
01ab659ef3
|
BUG修复 表结构更新
|
3 years ago |
|
dxfeng
|
cb1b37e05d
|
部门管理模块接口 拓展表通用方法抽取
|
3 years ago |
|
dxfeng
|
cbd33dbd3b
|
部门管理 列表 字段文本展示
|
3 years ago |
|
dxfeng
|
e2b7ca0072
|
!14 公司/分部 编辑页面接口优化
Merge pull request !14 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
a6a8053578
|
公司/分部 编辑页面接口优化
|
3 years ago |
|
dxfeng
|
11cd25a501
|
!12 公司/分部 拓展表 拓展明细表 接口
Merge pull request !12 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
0b9a5878eb
|
公司/分部 拓展表 拓展明细表 接口
|
3 years ago |
|
dxfeng
|
bd67e3c913
|
!11 公司/分部 主表拓展表 明细表拓展表接口
Merge pull request !11 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
362b64ae66
|
公司/分部 拓展表 拓展明细表 接口
|
3 years ago |
|
reset
|
009ce6f876
|
!10 联查部门
Merge pull request !10 from reset/feature/cl
|
3 years ago |
|
Chengliang
|
634f2d6b09
|
联查部门
|
3 years ago |
|
dxfeng
|
1bc660ab8d
|
公司/分部 新增、编辑表单 表结构更新
|
3 years ago |
|
dxfeng
|
d6c8ac96c2
|
公司/分部 基础表单、tab构建
|
3 years ago |
|
dxfeng
|
5b088ce146
|
公司/分部 列表接口
|
3 years ago |
|
dxfeng
|
5e8041348a
|
公司/分部 列表接口
|
3 years ago |
|
dxfeng
|
b2fd60a9bc
|
集团管理 更新接口
|
3 years ago |
|
dxfeng
|
6978eb5246
|
公司/分部管理 列表接口
|
3 years ago |
|
dxfeng
|
273e29fbe9
|
职务信息 禁用标识接口 表结构更新
|
3 years ago |
|
dxfeng
|
6f24a67ff0
|
职务分类左侧树接口
|
3 years ago |
|
dxfeng
|
f576df3495
|
职务信息接口
|
3 years ago |
|
dxfeng
|
8e4d698217
|
职务分类接口 表结构更新
|
3 years ago |
|
dxfeng
|
902f845543
|
岗位序列模块
|
3 years ago |
|
dxfeng
|
c445185f0d
|
统计BUG修复
|
3 years ago |
|
dxfeng
|
28009eee70
|
职级接口、表结构完善
|
3 years ago |
|
dxfeng
|
9a5939fac4
|
职等接口
|
3 years ago |
|
dxfeng
|
0dea1b6ae4
|
职级接口 职等搜索条件修复
|
3 years ago |
|
dxfeng
|
2d53588d39
|
职级接口 实现类注解修改
|
3 years ago |
|
dxfeng
|
1ce7ae9518
|
职等职级接口 getTableInfo接口
|
3 years ago |
|
dxfeng
|
7bd87d4707
|
职等职级接口 表结构SQL更新
|
3 years ago |
|
dxfeng
|
97ac4e5cdf
|
等级方案 职等职级接口
|
3 years ago |
|
dxfeng
|
2e6343a813
|
等级方案 职等职级接口
|
3 years ago |
|
dxfeng
|
0f9c8572a3
|
等级方案 职等职级接口
|
3 years ago |
|
dxfeng
|
4f51589a84
|
登记方案 职等职级接口
|
3 years ago |
|
dxfeng
|
2f282aa5c4
|
等级方案 接口优化
|
3 years ago |
|
dxfeng
|
68795ade06
|
等级方案 增删改查接口
|
3 years ago |
|
dxfeng
|
932105a8a0
|
等级方案 实体类 查询接口
|
3 years ago |
|
dxfeng
|
276247c161
|
职等职级 实体类 查询接口
|
3 years ago |
|
dxfeng
|
40f3585310
|
职等职级 实体类 查询接口
|
3 years ago |
|
Chengliang
|
3587eddc75
|
日志记录v1.0
|
3 years ago |
|
Chengliang
|
e7742fdfe0
|
初始化引入工具类
|
3 years ago |
