 dxfeng
|
025ee6283a
|
组织树BUG修复
|
2023-12-14 09:33:19 +08:00 |
 liang.cheng
|
20d5ca6861
|
Merge pull request '1.花名册定制列table字段顺序调整无效修复' (#226) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/226
|
2023-11-27 17:53:03 +08:00 |
|
Chengliang
|
06b0d09f92
|
1.花名册定制列table字段顺序调整无效修复
2.组织架构图 数据统计展示 追溯部分展示数据错误修复
3.组织架构图及编制管理中在职人数统计增加主次账号判断
|
2023-11-27 17:51:07 +08:00 |
|
liang.cheng
|
b3e7fd8398
|
Merge pull request 'feature/cl' (#225) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/225
|
2023-11-24 10:04:56 +08:00 |
|
Chengliang
|
4f446b20d0
|
历史编制 在职人数显示sql更改
|
2023-11-24 10:01:58 +08:00 |
|
Chengliang
|
b4aa07b797
|
组织架构图一级分部分权条件修复
|
2023-11-16 09:46:29 +08:00 |
|
liang.cheng
|
ab5e011640
|
Merge pull request '组织架构图一级分部分权' (#224) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/224
|
2023-11-15 17:07:38 +08:00 |
|
Chengliang
|
7da6fd7997
|
组织架构图一级分部分权
|
2023-11-15 17:06:07 +08:00 |
|
dxfeng
|
83ef5962b1
|
排序BUG修复
|
2023-10-25 15:43:27 +08:00 |
|
dxfeng
|
d2aa83f7f0
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2023-10-25 15:39:27 +08:00 |
|
dxfeng
|
1e3cacdc6e
|
排序BUG修复
|
2023-10-25 15:39:09 +08:00 |
|
liang.cheng
|
5768681170
|
Merge pull request 'feature/cl' (#223) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/223
|
2023-10-25 14:11:41 +08:00 |
|
Chengliang
|
481b7dbae9
|
test
|
2023-10-25 14:08:55 +08:00 |
|
dxfeng
|
35cf5dc8f6
|
排序BUG修复
|
2023-10-19 11:01:00 +08:00 |
|
dxfeng
|
dd13fee015
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2023-09-27 16:59:44 +08:00 |
|
dxfeng
|
4bba5f2b9e
|
花名册BUG修复
|
2023-09-27 16:59:23 +08:00 |
|
Chengliang
|
7fcee07495
|
部门管理全部导出
|
2023-09-22 16:30:29 +08:00 |
|
dxfeng
|
9e2c49d53b
|
Merge pull request '组织架构图BUG修复' (#222) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/222
|
2023-09-21 18:17:13 +08:00 |
|
dxfeng
|
ad60b22c37
|
组织架构图BUG修复
|
2023-09-21 18:16:23 +08:00 |
|
dxfeng
|
cfd781c4f8
|
Merge pull request '组织架构图BUG修复' (#221) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/221
|
2023-09-21 15:32:05 +08:00 |
|
dxfeng
|
dadef74b33
|
岗位管理删除BUG修复
|
2023-09-21 15:29:30 +08:00 |
|
Chengliang
|
4b6c4d5c3d
|
”测试“
|
2023-09-21 15:15:18 +08:00 |
|
dxfeng
|
5fad9088ca
|
组织架构图BUG修复
|
2023-09-21 14:37:14 +08:00 |
|
liang.cheng
|
d0925f3d1f
|
Merge pull request '组织架构图改造' (#220) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/220
|
2023-09-15 10:31:41 +08:00 |
|
Chengliang
|
1e2bacf630
|
组织架构图改造
|
2023-09-15 10:28:37 +08:00 |
Mlin
|
9c4283a5d4
|
组织架构图：其他维护显示bug修复
|
2023-09-15 09:45:31 +08:00 |
|
liang.cheng
|
9c4e721033
|
Merge pull request '组织架构图' (#219) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/219
|
2023-09-14 16:24:31 +08:00 |
|
Chengliang
|
e6ded7373c
|
组织架构图
|
2023-09-14 16:22:56 +08:00 |
|
Mlin
|
e44f87e3f9
|
组织架构图：在编数bug优化
|
2023-09-14 16:20:08 +08:00 |
|
Mlin
|
9f41a40d6e
|
组织架构图：在编数bug优化
|
2023-09-14 13:39:39 +08:00 |
|
liang.cheng
|
d1ec88779a
|
Merge pull request '组织架构图' (#218) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/218
|
2023-09-14 11:07:05 +08:00 |
|
Chengliang
|
f78ba6f6b3
|
组织架构图
|
2023-09-14 11:05:39 +08:00 |
|
liang.cheng
|
ef71054c94
|
Merge pull request '组织架构图改造' (#217) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/217
|
2023-09-13 18:07:35 +08:00 |
|
Chengliang
|
33c3b0ccaf
|
组织架构图改造
|
2023-09-13 18:04:09 +08:00 |
|
Mlin
|
9e11f30ac2
|
Merge remote-tracking branch 'origin/feature/ml' into develop
|
2023-09-13 13:35:18 +08:00 |
|
Mlin
|
57b6542a34
|
组织架构图：在编数
|
2023-09-13 13:31:44 +08:00 |
|
liang.cheng
|
e57af84b06
|
Merge pull request '组织架构图人数统计' (#216) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/216
|
2023-09-12 11:23:11 +08:00 |
|
Chengliang
|
3c43bfa465
|
组织架构图人数统计
|
2023-09-12 11:20:20 +08:00 |
|
Mlin
|
29bfc3002e
|
存为版本：在岗数、在编数
|
2023-09-12 10:24:44 +08:00 |
|
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
|
2023-09-11 17:09:27 +08:00 |
|
dxfeng
|
886717334b
|
编制方案新增，兼容PG
|
2023-09-11 15:47:02 +08:00 |
|
dxfeng
|
8b617f8423
|
编制方案新增，兼容Oracle
|
2023-09-08 17:57:49 +08:00 |
|
liang.cheng
|
c98a38c8a8
|
Merge pull request '编制模块' (#215) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/215
|
2023-09-08 10:56:48 +08:00 |
|
Chengliang
|
b7d7912fff
|
编制模块
|
2023-09-08 10:53:46 +08:00 |
|
liang.cheng
|
9ac1ca9852
|
Merge pull request '测试' (#214) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/214
|
2023-09-07 17:08:53 +08:00 |
|
Chengliang
|
88d53422e1
|
测试
|
2023-09-07 17:01:15 +08:00 |
|
dxfeng
|
27d07db87e
|
编制信息在编数递归统计
|
2023-09-07 16:50:42 +08:00 |
|
liang.cheng
|
442c4fe200
|
Merge pull request '测试' (#213) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/213
|
2023-09-07 16:09:44 +08:00 |
|
Chengliang
|
7dc5ee4fe9
|
测试
|
2023-09-07 16:08:34 +08:00 |
|
liang.cheng
|
4387020b06
|
Merge pull request '测试编制' (#212) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/212
|
2023-09-07 15:30:57 +08:00 |