Mlin
|
044f963f31
|
Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
# src/com/engine/organization/service/HrmResourceService.java
# src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
# src/com/engine/organization/web/HrmResourceController.java
# src/com/engine/organization/wrapper/HrmResourceWrapper.java
|
2023-01-12 11:33:23 +08:00 |
|
Mlin
|
09d4dbddd5
|
花名册列定制模板查询20230112
|
2023-01-12 09:41:58 +08:00 |
 dxfeng
|
d5ca665f2f
|
显示定制列穿梭框接口开发
|
2023-01-11 15:42:41 +08:00 |
|
dxfeng
|
6e1f70ef82
|
花名册高级搜索BUG修复
|
2023-01-10 18:25:53 +08:00 |
|
dxfeng
|
832fb2b9c4
|
花名册高级搜索BUG修复
|
2023-01-10 16:52:40 +08:00 |
|
dxfeng
|
f7ce6b028a
|
花名册高级搜索BUG修复
|
2023-01-10 15:13:33 +08:00 |
|
dxfeng
|
4ba6d5c21e
|
花名册高级搜索BUG修复
|
2023-01-10 11:37:28 +08:00 |
|
dxfeng
|
cfe08ddf4c
|
花名册动态查询SQL
|
2023-01-09 18:06:57 +08:00 |
|
dxfeng
|
3e0d3a1b2e
|
花名册高级搜索相关接口
|
2023-01-06 17:20:29 +08:00 |
|
dxfeng
|
4d43e0605b
|
Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf
|
2023-01-06 15:35:56 +08:00 |
|
dxfeng
|
92c51cfe18
|
花名册高级搜索相关接口
|
2023-01-06 15:35:38 +08:00 |
|
Mlin
|
ab881b8d8f
|
Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
# src/com/engine/organization/service/PersonnelResumeService.java
# src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java
# src/com/engine/organization/web/PersonnelResumeController.java
# src/com/engine/organization/wrapper/PersonnelResumeWrapper.java
|
2023-01-05 14:02:46 +08:00 |
|
Mlin
|
5450b99e37
|
人员简历导出下载（20230105）
|
2023-01-05 13:57:52 +08:00 |
|
dxfeng
|
586330f99e
|
人员筛选接口开发、调整
|
2023-01-04 16:50:59 +08:00 |
|
Mlin
|
90e6d7b765
|
Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
# src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java
# src/com/engine/organization/web/PersonnelResumeController.java
# src/com/engine/organization/wrapper/PersonnelResumeWrapper.java
|
2022-12-30 14:22:14 +08:00 |
|
Mlin
|
bc47f697d0
|
人员简历模板导出
|
2022-12-30 14:14:47 +08:00 |
|
dxfeng
|
33e9073e1c
|
人员简历相关接口开发
|
2022-12-29 15:52:08 +08:00 |
|
dxfeng
|
2e39235515
|
人员简历相关接口开发
|
2022-12-28 14:13:56 +08:00 |
|
Mlin
|
78dfc87f61
|
同步数据接口
|
2022-12-16 15:58:20 +08:00 |
|
Mlin
|
981ea3ad4a
|
存为版本取消存入map表，同步接口
|
2022-12-16 14:25:30 +08:00 |
|
dxfeng
|
f428dff5a0
|
根据职等职级字段，补充人员信息
|
2022-12-16 13:53:47 +08:00 |
 Chengliang
|
4d8948724e
|
岗位增加刷新按钮
|
2022-12-15 16:58:08 +08:00 |
|
Mlin
|
b3057e2f4e
|
版本查询接口
|
2022-12-15 14:38:48 +08:00 |
|
dxfeng
|
b9d06b4246
|
分权功能版本回退，岗位BUG修复
|
2022-12-13 15:57:21 +08:00 |
|
dxfeng
|
fab4614cd5
|
分权功能重构，调用EC方法
|
2022-12-13 10:58:57 +08:00 |
|
Mlin
|
1bdc7e2fa4
|
Merge remote-tracking branch 'origin/develop' into feature/ml
|
2022-12-09 16:04:50 +08:00 |
|
dxfeng
|
3470ba04cd
|
岗位关联关系调整
|
2022-12-09 14:29:20 +08:00 |
|
Mlin
|
73dbaf75ac
|
分部版本控制写入逻辑
|
2022-12-09 08:50:23 +08:00 |
|
Chengliang
|
d345a5fe66
|
版本管理
|
2022-12-08 09:56:25 +08:00 |
|
dxfeng
|
fb17f43323
|
部门管理功能逻辑调整
|
2022-11-30 16:14:23 +08:00 |
|
dxfeng
|
bd33075e14
|
部门管理功能逻辑调整
|
2022-11-30 16:06:40 +08:00 |
|
dxfeng
|
238d8e6f75
|
部门接口逻辑调整
|
2022-11-29 17:00:31 +08:00 |
|
dxfeng
|
9a2eabc8bd
|
部门切换数据源、实体类更新
|
2022-11-29 09:54:18 +08:00 |
|
dxfeng
|
aa3d0742ff
|
分部接口整理、代码优化
|
2022-11-28 11:15:54 +08:00 |
|
dxfeng
|
416471a283
|
分部列表、新增、删除、转移功能重写
|
2022-11-24 17:56:32 +08:00 |
|
dxfeng
|
16794bf98c
|
人员卡片按钮保存
|
2022-11-11 16:24:26 +08:00 |
|
dxfeng
|
d16f13405c
|
人员卡片按钮自定义
|
2022-11-11 13:59:45 +08:00 |
|
dxfeng
|
57d788d807
|
人员卡片按钮权限
|
2022-11-11 09:09:53 +08:00 |
|
Chengliang
|
afcbbcefb1
|
人员卡片权限接口
|
2022-11-02 17:44:52 +08:00 |
|
Chengliang
|
4e4cf54f8a
|
人员卡片权限
|
2022-11-01 17:53:31 +08:00 |
|
Chengliang
|
1e08772a9d
|
分权开关设置
|
2022-10-28 17:41:56 +08:00 |
|
liang.cheng
|
19cccb9345
|
Merge pull request 'feature/detach' (#29) from feature/detach into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/29
|
2022-10-28 09:36:40 +08:00 |
|
dxfeng
|
3989161281
|
组织架构图相关BUG修复
|
2022-10-27 19:11:58 +08:00 |
|
Chengliang
|
ef392f4d0a
|
模块管理分权
|
2022-10-27 15:00:12 +08:00 |
‘ml’
|
1be79b9698
|
分部、部门、岗位禁用修复1024
|
2022-10-27 15:00:07 +08:00 |
|
Chengliang
|
96cefec891
|
模块管理分权
|
2022-10-27 14:58:44 +08:00 |
|
Chengliang
|
f6ea4425cf
|
模块管理分权
|
2022-10-27 14:58:44 +08:00 |
|
Chengliang
|
4c74b583bf
|
模块管理分权
|
2022-10-27 14:58:44 +08:00 |
|
Chengliang
|
2b975e6636
|
模块管理分权中心接口
|
2022-10-27 14:58:44 +08:00 |
|
dxfeng
|
679c77f732
|
组织架构图相关BUG修复
|
2022-10-26 20:12:14 +08:00 |