 dxfeng
|
5dc920e364
|
人员信息分类
|
3 years ago |
|
dxfeng
|
cfc78875c6
|
人员信息分类
|
3 years ago |
|
dxfeng
|
b6caffc74f
|
人员信息分类 删除接口
|
3 years ago |
|
dxfeng
|
2744f85eff
|
BUG修复
|
3 years ago |
|
dxfeng
|
532a6d00ce
|
人员信息分类
|
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 |
|
reset
|
776d60674b
|
!207 fixed
Merge pull request !207 from reset/feature/cl
|
3 years ago |
|
Chengliang
|
c8bf27880a
|
fixed
|
3 years ago |
|
Chengliang
|
8043012b41
|
人基础员信息
|
3 years ago |
|
dxfeng
|
0d9cbe7ff5
|
BUG修复
|
3 years ago |
|
dxfeng
|
07dabf46a0
|
BUG修复
|
3 years ago |
|
dxfeng
|
fb5eea214b
|
BUG修复
|
3 years ago |
|
dxfeng
|
564b30eed8
|
BUG修复
|
3 years ago |
|
dxfeng
|
477a2f3bce
|
自定义字段BUG修复
|
3 years ago |
|
dxfeng
|
e135b02ed7
|
!201 BUG修复
Merge pull request !201 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
ff8660a586
|
BUG修复
|
3 years ago |
|
dxfeng
|
9c64467cc8
|
BUG修复
|
3 years ago |
|
dxfeng
|
b1ed914ebc
|
BUG修复，权限控制
|
3 years ago |
|
Chengliang
|
94ce6388e2
|
fixed
|
3 years ago |
|
dxfeng
|
ef6f21c636
|
BUG修复，权限控制
|
3 years ago |
|
dxfeng
|
5cce107318
|
BUG修复，权限控制
|
3 years ago |
|
dxfeng
|
3acec4730d
|
BUG修复，权限控制
|
3 years ago |
|
dxfeng
|
e3207f2996
|
BUG修复
|
3 years ago |
|
dxfeng
|
ea64d13503
|
BUG修复
|
3 years ago |
|
dxfeng
|
e0b09bde52
|
BUG修复
|
3 years ago |
|
dxfeng
|
cdafa11668
|
兼容Oracle
|
3 years ago |
|
dxfeng
|
e4d9d80fee
|
兼容Oracle
|
3 years ago |
|
dxfeng
|
1318fc1aba
|
BUG修复
|
3 years ago |
|
dxfeng
|
05c24b5e98
|
Oracle BUG修复
|
3 years ago |
|
dxfeng
|
3e6a4acf8c
|
Oracle BUG修复
|
3 years ago |
|
dxfeng
|
f27612db94
|
Oracle BUG修复
|
3 years ago |
|
dxfeng
|
abc470935e
|
!188 BUG修复
Merge pull request !188 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
6576335c6c
|
BUG修复
|
3 years ago |
|
reset
|
ad5cfbb527
|
!187 fix
Merge pull request !187 from reset/feature/cl
|
3 years ago |
|
Chengliang
|
fef2717962
|
组织架构图查询条件
|
3 years ago |
|
dxfeng
|
08a9ab7b0d
|
BUG修复
|
3 years ago |
|
dxfeng
|
48861cdace
|
BUG修复
|
3 years ago |
|
dxfeng
|
68ae1c03fd
|
BUG修复
|
3 years ago |
|
dxfeng
|
36ce009929
|
非标脚本完善，BUG修复
|
3 years ago |
|
dxfeng
|
5779beacff
|
非标脚本完善，BUG修复
|
3 years ago |
|
dxfeng
|
0e3fc1a238
|
同步CusFieldData数据接口
|
3 years ago |
|
dxfeng
|
ceb3484d6d
|
编制方案需求完善
|
3 years ago |
|
dxfeng
|
1c9b1abe69
|
编制方案需求完善
|
3 years ago |
|
dxfeng
|
7b88ba5a78
|
编制方案需求完善
|
3 years ago |
|
dxfeng
|
6c91c3d41d
|
BUG修复
|
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
|
bc151f7648
|
部门导入
|
3 years ago |
|
dxfeng
|
fc8aaf7729
|
部门导入、日志记录
|
3 years ago |
|
dxfeng
|
c23127acc2
|
分部导入、日志记录
|
3 years ago |
|
dxfeng
|
b1365da225
|
分部导入
|
3 years ago |
|
dxfeng
|
79d79575da
|
分部导入
|
3 years ago |
|
dxfeng
|
3356a7388e
|
分部导入
|
3 years ago |
|
dxfeng
|
9d304b0303
|
分部导入
|
3 years ago |
|
dxfeng
|
5ccb12569a
|
!163 BUG 修复
Merge pull request !163 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
56a697d4e4
|
BUG 修复
|
3 years ago |
MustangDeng
|
3e92e25520
|
Merge branch 'feature/djp' into develop
|
3 years ago |
|
MustangDeng
|
d950e1ae40
|
fix: fleader问题
|
3 years ago |
|
MustangDeng
|
cc318fa73c
|
Merge branch 'feature/djp' into develop
|
3 years ago |
|
MustangDeng
|
10a577d0c4
|
Merge remote-tracking branch 'origin/develop' into develop
|
3 years ago |
|
MustangDeng
|
ac490e1b8f
|
fix: whereSql合并
|
3 years ago |
|
MustangDeng
|
06ccafb464
|
fix: fnumber问题
|
3 years ago |
|
MustangDeng
|
0a1e6c6e7d
|
feature: 组织架构异步数据v1.0
|
3 years ago |
|
dxfeng
|
3ed9ec2f99
|
岗位浏览按钮优化
|
3 years ago |
|
dxfeng
|
8869a18977
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
fa663a1eaa
|
岗位浏览按钮优化
|
3 years ago |
|
reset
|
71109c35ae
|
Merge branch 'develop' of gitee.com:jmlcl/weaver-hrm-organization into feature/cl
|
3 years ago |
|
Chengliang
|
09490fe867
|
浏览按钮
|
3 years ago |
|
Chengliang
|
cb274d6a6c
|
需求优化2
|
3 years ago |
|
dxfeng
|
1db3f999f9
|
分部更新EC
|
3 years ago |
|
dxfeng
|
92b2f54ddd
|
人员拓展卡片、分部更新EC
|
3 years ago |
|
dxfeng
|
58e9f0ebb8
|
初始化SQL提交
|
3 years ago |
|
dxfeng
|
3c74268126
|
岗位浏览按钮
|
3 years ago |
|
dxfeng
|
b8adf9ab7b
|
岗位模块操作同步EC
|
3 years ago |
|
dxfeng
|
15c9ef7e61
|
分部、部门 添加UUID列;部门表结构更新
|
3 years ago |
|
dxfeng
|
d72c68dec0
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
e217ecbe16
|
分部更新EC
|
3 years ago |
|
reset
|
7f5568809c
|
!154 需求优化2
Merge pull request !154 from reset/feature/cl
|
3 years ago |
|
Chengliang
|
a1ed3e45c9
|
需求优化2
|
3 years ago |
|
dxfeng
|
b52bb93dfa
|
人员拓展卡片、分部更新EC
|
3 years ago |
|
dxfeng
|
81fcd96af6
|
人员拓展卡片
|
3 years ago |
|
dxfeng
|
7ecd58d27b
|
删除webService
|
3 years ago |
|
dxfeng
|
15a819a272
|
表结构更新
|
3 years ago |
|
MustangDen
|
f4f222ba91
|
Merge branch 'feature/djp' into develop
|
3 years ago |
|
MustangDen
|
7df8602e97
|
fix 组织架构sql问题
|
3 years ago |
|
dxfeng
|
2bbf5367c6
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
d760367a95
|
记录操作日志
|
3 years ago |
|
670124965@qq.com
|
58f3aedf9d
|
Merge branch 'feature/djp' into develop
|
3 years ago |
|
dxfeng
|
2175d7ca6a
|
记录操作日志
|
3 years ago |
|
dxfeng
|
7103eb0c73
|
记录操作日志
|
3 years ago |
|
dxfeng
|
e83e3b90fc
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
40a7c066a2
|
记录操作日志
|
3 years ago |
|
Chengliang
|
0bdcc18c56
|
日期组合改造
|
3 years ago |
|
MustangDeng
|
b589056585
|
组织结构图接口
|
3 years ago |
|
dxfeng
|
2702b175cd
|
记录操作日志
|
3 years ago |
|
dxfeng
|
cca52d7080
|
记录操作日志
|
3 years ago |
|
dxfeng
|
c139cd408a
|
记录操作日志
|
3 years ago |
|
dxfeng
|
4f52218e89
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
reset
|
9b1d7a26d3
|
!141 需求优化
Merge pull request !141 from reset/feature/cl
|
3 years ago |
|
dxfeng
|
bef63439b2
|
记录操作日志
|
3 years ago |
|
Chengliang
|
6c304e8a81
|
需求优化
|
3 years ago |
|
dxfeng
|
278194a4a3
|
记录操作日志,岗位优化
|
3 years ago |
|
dxfeng
|
f5d95fabb2
|
记录操作日志
|
3 years ago |
|
dxfeng
|
618e30e6ef
|
操作日志
|
3 years ago |
|
dxfeng
|
37142c3a3e
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
Conflicts:
src/com/engine/organization/service/impl/DemoServiceImpl.java
|
3 years ago |
|
dxfeng
|
033e90aa34
|
操作日志
|
3 years ago |
|
Chengliang
|
46aeddea39
|
需求调整
|
3 years ago |
|
Chengliang
|
eec9446dcd
|
去除weaverboot引用
|
3 years ago |
|
dxfeng
|
6b96ea7ca0
|
人员列表 搜索条件
|
3 years ago |
|
dxfeng
|
03f59d55d0
|
人员列表查询系统表 异常信息处理
|
3 years ago |
|
dxfeng
|
5291c3b855
|
分部列表BUG修复
|
3 years ago |
|
dxfeng
|
1a1646e818
|
人员导入
|
3 years ago |
|
dxfeng
|
fca0bb4dad
|
人员导入
|
3 years ago |
|
dxfeng
|
d508a4d9d0
|
人员导入，日志表结构
|
3 years ago |
|
dxfeng
|
66f5438d17
|
人员导入
|
3 years ago |
|
dxfeng
|
1e7caac8ff
|
人员导入
|
3 years ago |
|
dxfeng
|
655933236c
|
组织导入
|
3 years ago |
|
dxfeng
|
26ef362eb4
|
组织导入
|
3 years ago |
|
dxfeng
|
3f6b2c340b
|
人员导入
|
3 years ago |
|
dxfeng
|
c8b93b70b4
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
82aa6c5a03
|
人员导入
|
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
|
9b54954ef8
|
人员导入
|
3 years ago |
|
dxfeng
|
354220fac3
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
Chengliang
|
34715a05e7
|
类导入
|
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
|
c14286bf94
|
人员导入
|
3 years ago |
|
dxfeng
|
ff06d705e7
|
人员导入
|
3 years ago |
|
dxfeng
|
2fb33877f5
|
人员导入
|
3 years ago |
|
Chengliang
|
0ad6157c26
|
人员导出功能
|
3 years ago |
|
dxfeng
|
4eef6f62de
|
人员导入
|
3 years ago |
|
Chengliang
|
82aa37e2ed
|
bug修复 增加导入
|
3 years ago |
|
dxfeng
|
d0ea50cec5
|
部门、岗位 合并
|
3 years ago |
|
dxfeng
|
db4e066294
|
复制分部 表结构更新
|
3 years ago |
|
dxfeng
|
ff5b1a2e1b
|
复制部门、岗位
|
3 years ago |
|
dxfeng
|
2ea923f9c9
|
转移分部
|
3 years ago |
|
dxfeng
|
15131186de
|
分部、部门、岗位列表排序
|
3 years ago |
|
dxfeng
|
6c40245b02
|
组织人事测试、优化
|
3 years ago |
|
dxfeng
|
a2c768d0ab
|
组织人事测试、优化
|
3 years ago |
|
dxfeng
|
e4dc4704ce
|
组织人事测试、优化
|
3 years ago |
|
dxfeng
|
de1d4a8944
|
组织人事测试、优化
|
3 years ago |
|
dxfeng
|
f035662fb6
|
组织人事测试、优化
|
3 years ago |
|
dxfeng
|
eeb8c47451
|
组织人事测试、优化
|
3 years ago |
|
dxfeng
|
f72db1b5f9
|
组织人事测试、优化
|
3 years ago |
|
dxfeng
|
779e03cb32
|
修改时，编号可以修改
|
3 years ago |
|
dxfeng
|
9796bdc823
|
修改时，编号可以修改
|
3 years ago |
|
dxfeng
|
0b78da90ce
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
bdc813000e
|
人员管理查询条件 按钮接口，
是否禁用名称更改
|
3 years ago |
|
reset
|
9ab987c01b
|
!110 增加排序
Merge pull request !110 from reset/feature/cl
|
3 years ago |
|
Chengliang
|
d3bcc35f31
|
增加排序
|
3 years ago |
|
dxfeng
|
5b6cf8fe72
|
人员管理新增、编辑相关接口
|
3 years ago |
|
dxfeng
|
187be45bdf
|
人员管理：左侧树、列表接口
|
3 years ago |
|
dxfeng
|
fe0417618c
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
b8f866e28b
|
人员树接口
|
3 years ago |
|
Chengliang
|
4cbc15affd
|
优化
|
3 years ago |
|
dxfeng
|
d4e93eded4
|
BUG修复
|
3 years ago |
|
dxfeng
|
6474ce7128
|
BUG修复
|
3 years ago |
|
dxfeng
|
ad581a9c05
|
BUG修复
|
3 years ago |
|
dxfeng
|
abf99aaa51
|
BUG修复
|
3 years ago |
|
Chengliang
|
0ddecb1d2f
|
v1.2
|
3 years ago |
|
Chengliang
|
95744654b7
|
优化
|
3 years ago |
|
dxfeng
|
2af1fb6336
|
移动到组
|
3 years ago |
|
dxfeng
|
2a57f20693
|
BUG 修复
|
3 years ago |
|
dxfeng
|
6df1accb98
|
BUG 修复
|
3 years ago |
|
dxfeng
|
f42ee2b8d1
|
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
|
84adef0520
|
表结构更新
|
3 years ago |
|
dxfeng
|
e9aa68229d
|
表结构更新
|
3 years ago |
|
dxfeng
|
445507d10d
|
表结构更新
|
3 years ago |
|
reset
|
bb324ad8d1
|
!93 新增类型修改
Merge pull request !93 from reset/feature/cl
|
3 years ago |
|
Chengliang
|
b60a335a1c
|
新增类型修改
|
3 years ago |
|
dxfeng
|
c8604a8e40
|
数据返回格式修改
|
3 years ago |
|
dxfeng
|
9aebfbcecc
|
字段删除 移动分组
|
3 years ago |
|
dxfeng
|
3ba19c1b8d
|
代码合并
|
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
|
08ca2e0c5d
|
自定义字段列表
|
3 years ago |
|
dxfeng
|
52c964f199
|
添加自定义字段接口
|
3 years ago |
|
dxfeng
|
57b29a2312
|
BUG修复
|
3 years ago |
|
dxfeng
|
e588fb0c96
|
BUG修复
|
3 years ago |
|
dxfeng
|
70de6bbbd7
|
处理代码冲突
|
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
|
8564d29bf1
|
新增类型默认title
|
3 years ago |
|
Chengliang
|
f4f7038611
|
新增编辑类型
|
3 years ago |
|
Chengliang
|
068c446765
|
solve conflict
|
3 years ago |
|
Chengliang
|
032a363985
|
自定义页面树
|
3 years ago |
