 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 |
|
dxfeng
|
0a47b3548d
|
人员导入
|
3 years ago |
|
dxfeng
|
d5447c8e59
|
岗位导入
|
3 years ago |
|
dxfeng
|
c23127acc2
|
分部导入、日志记录
|
3 years ago |
|
dxfeng
|
b1365da225
|
分部导入
|
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 |
|
dxfeng
|
1db3f999f9
|
分部更新EC
|
3 years ago |
|
dxfeng
|
92b2f54ddd
|
人员拓展卡片、分部更新EC
|
3 years ago |
|
dxfeng
|
58e9f0ebb8
|
初始化SQL提交
|
3 years ago |
|
dxfeng
|
3c74268126
|
岗位浏览按钮
|
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
|
2175d7ca6a
|
记录操作日志
|
3 years ago |
|
dxfeng
|
7103eb0c73
|
记录操作日志
|
3 years ago |
|
dxfeng
|
40a7c066a2
|
记录操作日志
|
3 years ago |
|
dxfeng
|
2702b175cd
|
记录操作日志
|
3 years ago |
|
dxfeng
|
cca52d7080
|
记录操作日志
|
3 years ago |
|
dxfeng
|
c139cd408a
|
记录操作日志
|
3 years ago |
|
dxfeng
|
bef63439b2
|
记录操作日志
|
3 years ago |
|
dxfeng
|
278194a4a3
|
记录操作日志,岗位优化
|
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
|
26ef362eb4
|
组织导入
|
3 years ago |
|
dxfeng
|
3f6b2c340b
|
人员导入
|
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
|
4eef6f62de
|
人员导入
|
3 years ago |
|
Chengliang
|
82aa37e2ed
|
bug修复 增加导入
|
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
|
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
|
b8f866e28b
|
人员树接口
|
3 years ago |
|
dxfeng
|
abf99aaa51
|
BUG修复
|
3 years ago |
|
Chengliang
|
95744654b7
|
优化
|
3 years ago |
|
dxfeng
|
2a57f20693
|
BUG 修复
|
3 years ago |
|
dxfeng
|
6df1accb98
|
BUG 修复
|
3 years ago |
|
dxfeng
|
caff3332ce
|
BUG 修复
|
3 years ago |
|
dxfeng
|
e9aa68229d
|
表结构更新
|
3 years ago |
|
dxfeng
|
445507d10d
|
表结构更新
|
3 years ago |
|
dxfeng
|
c8604a8e40
|
数据返回格式修改
|
3 years ago |
|
dxfeng
|
9aebfbcecc
|
字段删除 移动分组
|
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
|
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
|
8564d29bf1
|
新增类型默认title
|
3 years ago |
|
Chengliang
|
f4f7038611
|
新增编辑类型
|
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 |
|
reset
|
07cb72c05c
|
!80 11
Merge pull request !80 from reset/feature/cl
|
3 years ago |
|
Chengliang
|
cde0608e02
|
自定义树页面修好
|
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 |
|
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
|
2ed79cc994
|
添加字段分组表
|
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
|
3a075f4ec6
|
公司/分部 主表、拓展表动态添加字段、动态分组
|
3 years ago |
|
dxfeng
|
49155c6893
|
公司/分部 主表、拓展表动态添加字段、动态分组
|
3 years ago |
|
dxfeng
|
497ed928e3
|
BUG修复
|
3 years ago |
|
dxfeng
|
64cbb907e0
|
编制上报 编制变更
|
3 years ago |
|
dxfeng
|
77d27801b4
|
编制上报 编制变更
|
3 years ago |
|
dxfeng
|
6956c0847e
|
权限管理 BUG修复
|
3 years ago |
|
dxfeng
|
de881d88b1
|
自动编号 BUG修复
|
3 years ago |
|
dxfeng
|
ad73710f0d
|
自动编号
|
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
|
d1dcc9d563
|
岗位复制和联查人员
|
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
|
8c348f2061
|
岗位模块BUG修复
|
3 years ago |
|
dxfeng
|
8da146b448
|
岗位表单更改
|
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 |
|
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
|
477df79cd1
|
分部列表分页 明细表字段展示 BUG修复
|
3 years ago |
|
dxfeng
|
01ab659ef3
|
BUG修复 表结构更新
|
3 years ago |
