 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 |
|
dxfeng
|
c8112bd701
|
!82 分组维护 新建分组
Merge pull request !82 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
b4b54fa1e1
|
分组维护 新建分组
|
3 years ago |
|
dxfeng
|
1c7b232172
|
!81 代码合并
Merge pull request !81 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
d809107c48
|
代码合并
|
3 years ago |
|
reset
|
07cb72c05c
|
!80 11
Merge pull request !80 from reset/feature/cl
|
3 years ago |
|
Chengliang
|
cde0608e02
|
自定义树页面修好
|
3 years ago |
|
dxfeng
|
568c9411da
|
代码合并
|
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
|
61590c804d
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
3 years ago |
|
dxfeng
|
2ed79cc994
|
添加字段分组表
|
3 years ago |
|
Chengliang
|
c3d5c50783
|
枚举修改
|
3 years ago |
|
dxfeng
|
eb0c55bc9e
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
Conflicts:
src/com/engine/organization/entity/SelectOptionParam.java
|
3 years ago |
|
dxfeng
|
bbe5a11f5d
|
BUG修复
|
3 years ago |
|
Chengliang
|
fadd2577cb
|
修改注释
|
3 years ago |
|
reset
|
a8d6f94592
|
!74 自定义设置后端
Merge pull request !74 from reset/feature/cl
|
3 years ago |
|
Chengliang
|
7256a94abd
|
自定义设置后端
|
3 years ago |
|
dxfeng
|
0dc034c66e
|
部门、岗位 主表、拓展表动态添加字段、动态分组
|
3 years ago |
|
dxfeng
|
3a075f4ec6
|
公司/分部 主表、拓展表动态添加字段、动态分组
|
3 years ago |
|
dxfeng
|
49155c6893
|
公司/分部 主表、拓展表动态添加字段、动态分组
|
3 years ago |
|
dxfeng
|
2ee23d5e75
|
BUG修复
|
3 years ago |
|
dxfeng
|
497ed928e3
|
BUG修复
|
3 years ago |
|
dxfeng
|
14725e4990
|
BUG修复
|
3 years ago |
|
dxfeng
|
80a33a7787
|
表结构更新 BUG修复
|
3 years ago |
|
dxfeng
|
ec4e92e113
|
BUG修复
|
3 years ago |
|
dxfeng
|
9877308b84
|
编制上报 编制变更
|
3 years ago |
|
dxfeng
|
64cbb907e0
|
编制上报 编制变更
|
3 years ago |
|
dxfeng
|
77d27801b4
|
编制上报 编制变更
|
3 years ago |
|
dxfeng
|
184580bb39
|
权限管理 BUG修复
|
3 years ago |
|
dxfeng
|
c0332d51ba
|
权限管理 BUG修复
|
3 years ago |
|
dxfeng
|
6956c0847e
|
权限管理 BUG修复
|
3 years ago |
|
dxfeng
|
ead9375423
|
自动编号 BUG修复
|
3 years ago |
|
dxfeng
|
66f58913e9
|
自动编号 BUG修复
|
3 years ago |
|
dxfeng
|
de881d88b1
|
自动编号 BUG修复
|
3 years ago |
|
dxfeng
|
1eb2eb3306
|
BUG修复
|
3 years ago |
|
dxfeng
|
7cb6bec147
|
权限控制
|
3 years ago |
|
dxfeng
|
6441726621
|
权限控制
|
3 years ago |
|
dxfeng
|
ad73710f0d
|
自动编号
|
3 years ago |
|
dxfeng
|
0c2a4a3e68
|
BUG修复
|
3 years ago |
|
dxfeng
|
c0389942a9
|
BUG修复
|
3 years ago |
|
dxfeng
|
e7b6d44fd5
|
BUG修复
|
3 years ago |
|
dxfeng
|
0282af7be6
|
联查岗位 请求方式
|
3 years ago |
|
dxfeng
|
eefd5b8483
|
自动生成编号 方法抽取
|
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
|
3d9a027c8f
|
部门BUG修复
|
3 years ago |
|
dxfeng
|
b027a118f1
|
部门左侧树 部门名称命名
|
3 years ago |
|
dxfeng
|
d7f910aa84
|
BUG修复 岗位复制
|
3 years ago |
|
dxfeng
|
5b2ab89a06
|
!42 被引用数据勾选框状态、按钮显隐
Merge pull request !42 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
ad70d2e3d4
|
被引用数据勾选框状态、按钮显隐
|
3 years ago |
|
Chengliang
|
790bf5a88a
|
岗位复制到部门
|
3 years ago |
|
Chengliang
|
d1dcc9d563
|
岗位复制和联查人员
|
3 years ago |
|
dxfeng
|
47452c716d
|
!39 岗位模块功能完善
Merge pull request !39 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
c56ec18212
|
岗位模块功能完善
|
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 |
|
Chengliang
|
a7b8c6b89d
|
编号管理实体
|
3 years ago |
|
dxfeng
|
2997cc75f6
|
!36 岗位模块BUG修复
Merge pull request !36 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
8c348f2061
|
岗位模块BUG修复
|
3 years ago |
|
dxfeng
|
1a0c403991
|
!35 岗位表单更改
Merge pull request !35 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
53c95d77dc
|
岗位表单更改
|
3 years ago |
|
dxfeng
|
8da146b448
|
岗位表单更改
|
3 years ago |
|
reset
|
3520b36224
|
!34 1
Merge pull request !34 from reset/feature/cl
|
3 years ago |
|
Chengliang
|
7c950e8626
|
编号管理
|
3 years ago |
|
dxfeng
|
04c7ec175f
|
岗位表单更改
|
3 years ago |
|
dxfeng
|
bdb7e4d7b6
|
岗位表单更改
|
3 years ago |
|
dxfeng
|
8f0da9a7a7
|
岗位表单更改
|
3 years ago |
|
dxfeng
|
090c2659df
|
岗位表单更改
|
3 years ago |
|
reset
|
6601f117cd
|
!31 编号管理
Merge pull request !31 from reset/feature/cl
|
3 years ago |
|
Chengliang
|
b4de9ae287
|
编号管理
|
3 years ago |
|
dxfeng
|
7927a3ceea
|
包名更改
|
3 years ago |
|
dxfeng
|
91c4116529
|
职务管理模块开发
|
3 years ago |
|
Chengliang
|
3ac4461f8b
|
table操作菜单权限
|
3 years ago |
|
dxfeng
|
92953661ff
|
部门、岗位接口开发；代码合并
|
3 years ago |
|
dxfeng
|
33f5ec9458
|
部门、岗位接口开发；代码合并
|
3 years ago |
|
dxfeng
|
1ae3dcdec0
|
11
|
3 years ago |
|
Chengliang
|
5eabc87fb3
|
checkbox控制
|
3 years ago |
|
dxfeng
|
d003e7a135
|
!25 编制方案 年度字段优化
Merge pull request !25 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
30ef0c2d84
|
编制方案 年度字段优化
|
3 years ago |
|
dxfeng
|
d20e8079d7
|
!24 编制表接口
Merge pull request !24 from dxfeng/feature/dxf
|
3 years ago |
|
dxfeng
|
4abede9170
|
编制表接口
|
3 years ago |
|
dxfeng
|
51ae24ea44
|
编制表接口
|
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
|
3578a0f166
|
明细表更新BUG修复
|
3 years ago |
|
dxfeng
|
477df79cd1
|
分部列表分页 明细表字段展示 BUG修复
|
3 years ago |
|
dxfeng
|
01ab659ef3
|
BUG修复 表结构更新
|
3 years ago |
|
dxfeng
|
cb1b37e05d
|
部门管理模块接口 拓展表通用方法抽取
|
3 years ago |
|
dxfeng
|
cd6121f0b0
|
部门管理 新增表单 数据保存
|
3 years ago |
|
dxfeng
|
12e435c1cb
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
Conflicts:
src/com/engine/organization/service/impl/DepartmentServiceImpl.java
|
3 years ago |
|
dxfeng
|
cbd33dbd3b
|
部门管理 列表 字段文本展示
|
3 years ago |
