 Chengliang
|
06b0d09f92
|
1.花名册定制列table字段顺序调整无效修复
2.组织架构图 数据统计展示 追溯部分展示数据错误修复
3.组织架构图及编制管理中在职人数统计增加主次账号判断
|
1 year ago |
|
Chengliang
|
4f446b20d0
|
历史编制 在职人数显示sql更改
|
1 year ago |
|
Chengliang
|
b4aa07b797
|
组织架构图一级分部分权条件修复
|
1 year ago |
|
liang.cheng
|
ab5e011640
|
Merge pull request '组织架构图一级分部分权' (#224) from feature/cl into develop
Reviewed-on: #224
|
1 year ago |
|
Chengliang
|
7da6fd7997
|
组织架构图一级分部分权
|
1 year ago |
 dxfeng
|
83ef5962b1
|
排序BUG修复
|
2 years ago |
|
dxfeng
|
d2aa83f7f0
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
1e3cacdc6e
|
排序BUG修复
|
2 years ago |
|
liang.cheng
|
5768681170
|
Merge pull request 'feature/cl' (#223) from feature/cl into develop
Reviewed-on: #223
|
2 years ago |
|
Chengliang
|
481b7dbae9
|
test
|
2 years ago |
|
dxfeng
|
35cf5dc8f6
|
排序BUG修复
|
2 years ago |
|
dxfeng
|
4bba5f2b9e
|
花名册BUG修复
|
2 years ago |
|
Chengliang
|
7fcee07495
|
部门管理全部导出
|
2 years ago |
|
dxfeng
|
ad60b22c37
|
组织架构图BUG修复
|
2 years ago |
|
dxfeng
|
dadef74b33
|
岗位管理删除BUG修复
|
2 years ago |
|
Chengliang
|
4b6c4d5c3d
|
”测试“
|
2 years ago |
|
dxfeng
|
5fad9088ca
|
组织架构图BUG修复
|
2 years ago |
|
liang.cheng
|
d0925f3d1f
|
Merge pull request '组织架构图改造' (#220) from feature/cl into develop
Reviewed-on: #220
|
2 years ago |
|
Chengliang
|
1e2bacf630
|
组织架构图改造
|
2 years ago |
Mlin
|
9c4283a5d4
|
组织架构图：其他维护显示bug修复
|
2 years ago |
|
liang.cheng
|
9c4e721033
|
Merge pull request '组织架构图' (#219) from feature/cl into develop
Reviewed-on: #219
|
2 years ago |
|
Chengliang
|
e6ded7373c
|
组织架构图
|
2 years ago |
|
Mlin
|
e44f87e3f9
|
组织架构图：在编数bug优化
|
2 years ago |
|
Mlin
|
9f41a40d6e
|
组织架构图：在编数bug优化
|
2 years ago |
|
Chengliang
|
f78ba6f6b3
|
组织架构图
|
2 years ago |
|
liang.cheng
|
ef71054c94
|
Merge pull request '组织架构图改造' (#217) from feature/cl into develop
Reviewed-on: #217
|
2 years ago |
|
Chengliang
|
33c3b0ccaf
|
组织架构图改造
|
2 years ago |
|
Mlin
|
9e11f30ac2
|
Merge remote-tracking branch 'origin/feature/ml' into develop
|
2 years ago |
|
Mlin
|
57b6542a34
|
组织架构图：在编数
|
2 years ago |
|
liang.cheng
|
e57af84b06
|
Merge pull request '组织架构图人数统计' (#216) from feature/cl into develop
Reviewed-on: #216
|
2 years ago |
|
Chengliang
|
3c43bfa465
|
组织架构图人数统计
|
2 years ago |
|
Mlin
|
29bfc3002e
|
存为版本：在岗数、在编数
|
2 years ago |
|
Mlin
|
4cbb658019
|
Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
# src/com/engine/organization/service/impl/ChartServiceImpl.java
# src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
|
2 years ago |
|
dxfeng
|
886717334b
|
编制方案新增，兼容PG
|
2 years ago |
|
dxfeng
|
8b617f8423
|
编制方案新增，兼容Oracle
|
2 years ago |
|
Chengliang
|
b7d7912fff
|
编制模块
|
2 years ago |
|
liang.cheng
|
9ac1ca9852
|
Merge pull request '测试' (#214) from feature/cl into develop
Reviewed-on: #214
|
2 years ago |
|
Chengliang
|
88d53422e1
|
测试
|
2 years ago |
|
dxfeng
|
27d07db87e
|
编制信息在编数递归统计
|
2 years ago |
|
liang.cheng
|
442c4fe200
|
Merge pull request '测试' (#213) from feature/cl into develop
Reviewed-on: #213
|
2 years ago |
|
Chengliang
|
7dc5ee4fe9
|
测试
|
2 years ago |
|
liang.cheng
|
4387020b06
|
Merge pull request '测试编制' (#212) from feature/cl into develop
Reviewed-on: #212
|
2 years ago |
|
Chengliang
|
d90906cb2e
|
测试编制
|
2 years ago |
|
liang.cheng
|
89cd9761f5
|
Merge pull request '测试' (#211) from feature/cl into develop
Reviewed-on: #211
|
2 years ago |
|
Chengliang
|
21cd02c72a
|
测试
|
2 years ago |
|
dxfeng
|
19b844ed89
|
编制信息导入重复校验
|
2 years ago |
|
dxfeng
|
640892bcb2
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
7c8f209268
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
Chengliang
|
7cb3b019a8
|
编制模块
|
2 years ago |
|
Chengliang
|
eee636230d
|
编制模块
|
2 years ago |
|
Chengliang
|
d8d69381ea
|
编制模块
|
2 years ago |
|
Chengliang
|
498da847b3
|
编制模块修改
|
2 years ago |
|
dxfeng
|
e8bcb4af99
|
花名册台账字段展示BUG修复
|
2 years ago |
|
dxfeng
|
8155466a96
|
分权管理BUG修复
|
2 years ago |
|
liang.cheng
|
a0f703099e
|
Merge pull request 'feature/cl' (#208) from feature/cl into develop
Reviewed-on: #208
|
2 years ago |
|
dxfeng
|
b3982dff2e
|
花名册台账字段展示BUG修复
|
2 years ago |
|
dxfeng
|
a288ebd311
|
花名册台账字段展示BUG修复
|
2 years ago |
|
Chengliang
|
51dc953766
|
企通学配置
|
2 years ago |
|
Chengliang
|
a94cdc7e37
|
企通学配置自定义
|
2 years ago |
|
liang.cheng
|
d9ca391a6e
|
Merge pull request '企通学单点' (#207) from feature/cl into develop
Reviewed-on: #207
|
2 years ago |
|
Chengliang
|
bb68a3bc7a
|
企通学单点
|
2 years ago |
|
dxfeng
|
cf7ac82356
|
分权管理BUG修复
|
2 years ago |
|
dxfeng
|
058aa353e5
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
liang.cheng
|
e4c1f4dba6
|
Merge pull request '11' (#205) from feature/cl into develop
Reviewed-on: #205
|
2 years ago |
|
Chengliang
|
b1d506cf15
|
11
|
2 years ago |
|
dxfeng
|
7e8a9f2556
|
职级、岗位序列分权
|
2 years ago |
|
dxfeng
|
79b395fc37
|
等级方案、职等分权
|
2 years ago |
|
dxfeng
|
acccc9537c
|
分权新增、更新功能重构
|
2 years ago |
|
dxfeng
|
2bcc0ae131
|
组织架构图显示部门
|
2 years ago |
|
dxfeng
|
ec7bd987b2
|
人员快捷搜索BUG修复
|
2 years ago |
|
dxfeng
|
a3380ce0bd
|
人员快捷搜索BUG修复
|
2 years ago |
|
Chengliang
|
8c2a9937f9
|
修复日期
|
2 years ago |
|
Chengliang
|
01dc480720
|
测试
|
2 years ago |
|
dxfeng
|
0898759845
|
人员快捷搜索BUG修复
|
2 years ago |
|
dxfeng
|
6bc5db7912
|
人员快捷搜索
|
2 years ago |
|
dxfeng
|
3ff6712b27
|
快捷搜索条件表单
|
2 years ago |
|
dxfeng
|
16cb2c844d
|
快捷搜索条件表单
|
2 years ago |
|
dxfeng
|
5a71b861fd
|
快捷搜索条件表单
|
2 years ago |
|
dxfeng
|
a56b888a74
|
快捷搜索条件表单
|
2 years ago |
|
dxfeng
|
4438f3937a
|
快捷搜索条件表单
|
2 years ago |
|
dxfeng
|
17b9c57649
|
组织架构图排序
|
2 years ago |
|
dxfeng
|
939c6c3f51
|
快捷搜索自定义接口BUG修复
|
2 years ago |
|
dxfeng
|
dc0c823caf
|
快捷搜索自定义接口BUG修复
|
2 years ago |
|
dxfeng
|
55a22e8038
|
快捷搜索自定义接口BUG修复
|
2 years ago |
|
dxfeng
|
53e96cafe5
|
recordSet调整成MyBatis
|
2 years ago |
|
Mlin
|
1fb50a8ce9
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
dxfeng
|
dacd9b180e
|
快捷搜索基本代码提交
|
2 years ago |
|
dxfeng
|
8a3885db76
|
人员动态列导出
|
2 years ago |
|
Mlin
|
4afe2615ec
|
代码优化
|
2 years ago |
|
Mlin
|
e0187b7337
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
2a6d6dfd16
|
拖拽逻辑代码优化
|
2 years ago |
|
dxfeng
|
853bf4b006
|
组织架构树、部门台账优化；岗位同步逻辑重写
|
2 years ago |
|
dxfeng
|
49e9e33624
|
岗位台账展示信息优化
|
2 years ago |
|
dxfeng
|
a065c7369d
|
岗位台账展示信息优化
|
2 years ago |
|
Mlin
|
af4a2c87ef
|
拖拽逻辑代码优化
|
2 years ago |
|
Mlin
|
3619fe5ac3
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
6247129bcf
|
拖拽优化
|
2 years ago |
|
dxfeng
|
82d6cc74db
|
组织调整树BUG修复
|
2 years ago |
|
Mlin
|
8b894bbaa3
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
3bb8c35fb5
|
部门拖拽优化0802
|
2 years ago |
|
dxfeng
|
d068aa6bc1
|
组织管理，树结构展开功能完善、分部删除BUG修复
|
2 years ago |
|
Mlin
|
1ac72f3519
|
部门拖拽优化0802
|
2 years ago |
|
Mlin
|
33dda680df
|
部门拖拽优化
|
2 years ago |
|
Mlin
|
123f7eaea6
|
部门拖拽优化
|
2 years ago |
|
Mlin
|
72d2867244
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
2fdd604872
|
部门拖拽:分部优化
|
2 years ago |
|
dxfeng
|
647f692920
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
04826fcaa4
|
组织管理，树结构展开功能完善
|
2 years ago |
|
Mlin
|
63491e9906
|
部门拖拽转移优化
|
2 years ago |
|
Mlin
|
315a67173d
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
32029788c4
|
部门拖拽转移
|
2 years ago |
|
dxfeng
|
9a6f0a845e
|
组织管理，架构图树排序、BUG修复
|
2 years ago |
|
dxfeng
|
ea4a3201aa
|
组织管理，架构图部门树选择数据接口
|
2 years ago |
|
dxfeng
|
e011880672
|
组织管理，树结构禁用非部门节点
|
2 years ago |
|
Mlin
|
50ee698cc2
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2 years ago |
|
Mlin
|
1a307f9923
|
部门合并，名称占用释放
|
2 years ago |
|
dxfeng
|
59d4fac4e2
|
组织管理，部门封存传参，树结构优化
|
2 years ago |
|
dxfeng
|
29bfcdc418
|
组织管理，分部封存传参
|
2 years ago |
|
dxfeng
|
3fa679b139
|
组织管理，树结构兼容是否封存
|
2 years ago |
|
dxfeng
|
1280b3c6b9
|
组织管理，TreeSelect组件全量接口开发
|
2 years ago |
|
dxfeng
|
b1b24fc925
|
组织管理，移动树接口提交
|
2 years ago |
|
dxfeng
|
9610361733
|
组织管理，移动树接口提交
|
2 years ago |
|
dxfeng
|
87372be17f
|
组织管理，编制导入BUG修复
|
2 years ago |
|
dxfeng
|
46ecec4b17
|
组织管理，岗位台账、岗位浏览按钮列表展示优化
|
2 years ago |
|
dxfeng
|
fab01583ad
|
组织架构图，部门选择树
|
2 years ago |
|
dxfeng
|
f4c29de76b
|
新建编制信息初始化在编数
|
2 years ago |
|
Mlin
|
2ee38ccc0c
|
版本管理代码优化
|
2 years ago |
|
Chengliang
|
d9e2a695cf
|
排序 时间轴
|
2 years ago |
|
Mlin
|
775405741a
|
版本管理，事务控制bug优化
|
2 years ago |
|
Mlin
|
0a809a29c9
|
版本管理，事务控制bug优化
|
2 years ago |
|
Mlin
|
1abbc7cddf
|
版本记录，未新增分部类型、部门类型字段时同步bug修复
|
2 years ago |
|
Mlin
|
7417cbac79
|
虚拟维度表查询bug修复
|
2 years ago |
|
Mlin
|
8ac0f45d29
|
版本记录，虚拟人员bug修复
|
2 years ago |
|
Mlin
|
3d7b5927b3
|
版本记录，虚拟人员bug修复
|
2 years ago |
|
Mlin
|
45b663217f
|
版本记录，分部bug修复
|
2 years ago |
|
Mlin
|
7d1b7b8795
|
版本记录，虚拟人员bug修复
|
2 years ago |
|
dxfeng
|
696f66ec98
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
d510f32bc5
|
组织架构图，BUG修复
|
2 years ago |
|
Chengliang
|
f5275c2148
|
v3
|
2 years ago |
|
Mlin
|
725d64888c
|
组织管理版本记录int类型bug修复
|
2 years ago |
|
Mlin
|
971b997dff
|
Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
# src/com/engine/organization/service/impl/ChartServiceImpl.java
|
2 years ago |
|
Mlin
|
10a9a350b4
|
组织管理版本记录数据同步
|
2 years ago |
|
dxfeng
|
62b25d6a65
|
组织架构图，回溯详细信息
|
2 years ago |
|
dxfeng
|
c61a071746
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
dxfeng
|
3bf299afa4
|
组织架构图，回溯详细信息
|
2 years ago |
|
Chengliang
|
81f7ecfec9
|
列表
|
2 years ago |
|
dxfeng
|
151e77e69b
|
组织架构图，回溯详细信息
|
2 years ago |
|
dxfeng
|
104d94ba6f
|
组织架构图，回溯数据查询
|
2 years ago |
|
dxfeng
|
775cf4a8ae
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2 years ago |
|
Mlin
|
6befb0de03
|
Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
# src/com/engine/organization/service/ChartService.java
# src/com/engine/organization/service/impl/ChartServiceImpl.java
|
2 years ago |
