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 |
|
Chengliang
|
d90906cb2e
|
测试编制
|
2023-09-07 15:28:30 +08:00 |
|
liang.cheng
|
89cd9761f5
|
Merge pull request '测试' (#211) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/211
|
2023-09-07 10:45:21 +08:00 |
|
Chengliang
|
21cd02c72a
|
测试
|
2023-09-07 10:43:56 +08:00 |
|
dxfeng
|
19b844ed89
|
编制信息导入重复校验
|
2023-09-06 17:24:32 +08:00 |
|
dxfeng
|
640892bcb2
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2023-09-06 17:19:58 +08:00 |
|
liang.cheng
|
311d7b6fd8
|
Merge pull request 'feature/cl' (#210) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/210
|
2023-09-06 17:19:41 +08:00 |
|
dxfeng
|
7c8f209268
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2023-09-06 17:18:38 +08:00 |
|
Chengliang
|
7cb3b019a8
|
编制模块
|
2023-09-06 17:17:10 +08:00 |
|
Chengliang
|
eee636230d
|
编制模块
|
2023-09-06 09:55:43 +08:00 |
|
Chengliang
|
d8d69381ea
|
编制模块
|
2023-09-04 17:52:02 +08:00 |
|
Chengliang
|
498da847b3
|
编制模块修改
|
2023-09-01 17:13:41 +08:00 |
|
Chengliang
|
a52ef7ecb2
|
脚本
|
2023-09-01 17:13:41 +08:00 |
|
dxfeng
|
e8bcb4af99
|
花名册台账字段展示BUG修复
|
2023-09-01 17:13:41 +08:00 |
|
dxfeng
|
8155466a96
|
分权管理BUG修复
|
2023-09-01 17:13:41 +08:00 |
|
liang.cheng
|
a0f703099e
|
Merge pull request 'feature/cl' (#208) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/208
|
2023-09-01 17:12:19 +08:00 |
|
dxfeng
|
b3982dff2e
|
花名册台账字段展示BUG修复
|
2023-08-30 11:29:59 +08:00 |
|
dxfeng
|
a288ebd311
|
花名册台账字段展示BUG修复
|
2023-08-30 09:59:42 +08:00 |
|
Chengliang
|
51dc953766
|
企通学配置
|
2023-08-22 18:07:08 +08:00 |
|
Chengliang
|
a94cdc7e37
|
企通学配置自定义
|
2023-08-21 18:11:50 +08:00 |
|
liang.cheng
|
d9ca391a6e
|
Merge pull request '企通学单点' (#207) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/207
|
2023-08-18 17:40:51 +08:00 |
|
Chengliang
|
bb68a3bc7a
|
企通学单点
|
2023-08-18 17:33:16 +08:00 |
|
dxfeng
|
75fd02be5f
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2023-08-18 15:15:51 +08:00 |
|
dxfeng
|
cf7ac82356
|
分权管理BUG修复
|
2023-08-18 15:15:32 +08:00 |
|
dxfeng
|
24485eff0d
|
Merge pull request 'feature/dxf' (#206) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/206
|
2023-08-18 09:30:08 +08:00 |
|
dxfeng
|
058aa353e5
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2023-08-17 17:19:52 +08:00 |
|
liang.cheng
|
e4c1f4dba6
|
Merge pull request '11' (#205) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/205
|
2023-08-17 17:19:07 +08:00 |
|
dxfeng
|
8e681bc639
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2023-08-17 17:18:50 +08:00 |
|
Chengliang
|
b1d506cf15
|
11
|
2023-08-17 17:17:59 +08:00 |