Commit Graph

704 Commits

Author SHA1 Message Date
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 00ab437f9e 增加全部人员简历下载条件(去除离职)(20230106) 2023-01-06 15:32:31 +08:00
Mlin c7ce7ea540 优化人员简历目录删除问题(20230105) 2023-01-05 16:25:54 +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 b515fdb78f 人员简历导出、压缩下载(20230105) 2023-01-05 14:55:31 +08:00
Mlin d81776680f Merge remote-tracking branch 'origin/develop' into feature/ml 2023-01-05 14:06:44 +08:00
dxfeng b2500cfbd0 人员筛选接口开发、调整 2023-01-05 14:05:31 +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 06da61d889 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-01-03 11:41:33 +08:00
Mlin 6d1603aeb2 人员简历模板导出20230103 2023-01-03 11:41:21 +08:00
dxfeng bccae91e75 人员简历模板优化 2023-01-03 10:32:11 +08:00
dxfeng 395d93067a Oracle,SQL脚本BUG修复 2023-01-03 10:01:19 +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 a86a8dd2c8 人员简历模板导出 2022-12-30 14:19:16 +08:00
Mlin bc47f697d0 人员简历模板导出 2022-12-30 14:14:47 +08:00
dxfeng dde1d0d0db 人员简历相关接口开发 2022-12-30 10:40:42 +08:00
dxfeng 687b580494 人员简历相关接口开发 2022-12-30 10:38:47 +08:00
dxfeng df57b4e71f 人员简历相关接口开发 2022-12-30 10:20:08 +08:00
dxfeng c41716318d 人员简历相关接口开发 2022-12-30 10:16:48 +08:00
dxfeng 702092c5a2 人员简历相关接口开发 2022-12-30 09:39:16 +08:00
dxfeng ea22378df0 人员简历相关接口开发 2022-12-29 17:49:37 +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 950da74ac8 人员岗位显示bug修复 2022-12-22 11:26:09 +08:00
Mlin 347e3505d1 多个部门负责人存入版本bug修复 2022-12-21 16:26:21 +08:00
Mlin 7b9a82dda9 多部门负责人截取显示bug修复 2022-12-21 15:45:49 +08:00
Mlin 4a0949b6b1 多部门负责人截取显示bug修复 2022-12-21 15:13:16 +08:00
Mlin 18b50a4431 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-12-21 14:54:07 +08:00
Mlin d231bf3bd3 多部门负责人截取显示 2022-12-21 14:53:56 +08:00
dxfeng 8c6becc29c Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-21 13:41:42 +08:00
Mlin fbac015a99 部门转移岗位重复bug修复 2022-12-21 13:40:19 +08:00
dxfeng 23eae34062 人员导出BUG 2022-12-21 13:38:53 +08:00
dxfeng a6ed99fc60 部门导入BUG修复 2022-12-21 11:06:14 +08:00
Mlin 33106aaaec sqlserver版本存入、部门转移 2022-12-21 10:58:49 +08:00
dxfeng b7938cfb6b 多部门负责人BUG修复 2022-12-20 18:17:40 +08:00
dxfeng 4ca7eeb93c Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-20 16:52:52 +08:00
dxfeng 665172325e 职等职级BUG修复 2022-12-20 16:52:36 +08:00
Mlin 6dcb5db15f 动态字段查询 2022-12-20 15:36:39 +08:00
dxfeng a080ebea22 岗位浏览按钮BUG修复 2022-12-20 15:17:36 +08:00
dxfeng 30bec2120a Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-20 13:53:35 +08:00
dxfeng 31a26dec08 部门合并、转移。岗位同步BUG修复 2022-12-20 13:53:18 +08:00
Mlin b8158cdcec oracle版数据同步问题 2022-12-20 10:57:46 +08:00
dxfeng ebf7a1bdda Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-20 09:28:39 +08:00
dxfeng e7cc13ed60 BUG修复 2022-12-20 09:13:11 +08:00