Commit Graph

743 Commits

Author SHA1 Message Date
dxfeng f79ad8681f BUG修复 2023-01-12 16:49:54 +08:00
dxfeng 563070a539 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-01-12 15:46:01 +08:00
dxfeng 15b14cf4b1 显示定制列穿梭框接口开发 2023-01-12 15:45:43 +08:00
Mlin a395024010 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-01-12 15:17:58 +08:00
Mlin a677da06a6 花名册模板管理查询、编辑保存20230112 2023-01-12 15:17:38 +08:00
dxfeng cb814ef077 显示定制列穿梭框接口开发 2023-01-12 14:14:25 +08:00
dxfeng b93a3d7b1c Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-01-12 14:10:10 +08:00
dxfeng a7b1f33e1a 显示定制列穿梭框接口开发 2023-01-12 14:08:51 +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 0f73f6e3ac 显示定制列穿梭框接口开发 2023-01-11 16:28:19 +08:00
dxfeng d5ca665f2f 显示定制列穿梭框接口开发 2023-01-11 15:42:41 +08:00
Mlin f86562c802 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-01-11 14:48:38 +08:00
Mlin 71c427d1ec 花名册自定义字段展示20230111 2023-01-11 14:48:24 +08:00
dxfeng 4076a755f1 花名册高级搜索BUG修复 2023-01-11 14:26:13 +08:00
Mlin 12bcd367c7 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-01-11 09:07:46 +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 9dbce1e8c5 花名册高级搜索BUG修复 2023-01-10 14:08:41 +08:00
dxfeng 4ba6d5c21e 花名册高级搜索BUG修复 2023-01-10 11:37:28 +08:00
dxfeng 9e6cc7da2a Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-01-09 18:07:20 +08:00
dxfeng cfe08ddf4c 花名册动态查询SQL 2023-01-09 18:06:57 +08:00
Chengliang 07786bc2a6 花名册增加按钮 2023-01-09 14:59:26 +08:00
dxfeng 01c042ebbc 高级搜索表单完善 2023-01-09 10:27:30 +08:00
dxfeng 503697dd55 花名册高级搜索相关接口 2023-01-06 17:40:23 +08:00
Mlin 1c3b1296b5 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-01-06 17:27:07 +08:00
Mlin d1612a151a 花名册自定义字段展示20230106 2023-01-06 17:27:02 +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 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