Commit Graph

192 Commits

Author SHA1 Message Date
dxfeng 2b8e3dbb85 组织架构图完善 2023-02-07 09:37:40 +08:00
dxfeng abb3d04953 回溯人员架构图接口开发 2023-02-01 11:27:33 +08:00
dxfeng e20d1d57ce 回溯人员架构图接口开发 2023-01-31 17:14:03 +08:00
dxfeng 8a2b024de7 汇总接口开发 2023-01-30 16:32:40 +08:00
dxfeng 1cf8d42e75 代码提交、功能重写 2023-01-29 15:07:10 +08:00
dxfeng 0d9e03507b 人员回溯功能开发 2023-01-29 09:50:44 +08:00
Mlin 5c44a11ff3 花名册模板列定制功能优化20230113 2023-01-13 13:44:05 +08:00
dxfeng f79ad8681f BUG修复 2023-01-12 16:49:54 +08:00
Mlin a677da06a6 花名册模板管理查询、编辑保存20230112 2023-01-12 15:17:38 +08:00
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 8750850dfa 花名册列定制模板查询20230112 2023-01-12 11:30:25 +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 1d053a0437 花名册高级搜索BUG修复 2023-01-10 17:31:22 +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 01c042ebbc 高级搜索表单完善 2023-01-09 10:27:30 +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 0ef350c902 人员简历合并导出日志(20230105) 2023-01-05 16:00:28 +08:00
Mlin 95a6b388c4 修复人员简历合并图片重复问题(20230105) 2023-01-05 15:34:39 +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 b53007b7c2 人员简历相关接口开发 2022-12-28 15:40:23 +08:00
dxfeng 2e39235515 人员简历相关接口开发 2022-12-28 14:13:56 +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
Chengliang d345a5fe66 版本管理 2022-12-08 09:56:25 +08:00
dxfeng 6fc67d7d67 分部查看、编辑接口调整 2022-12-07 10:36:05 +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