Commit Graph

170 Commits

Author SHA1 Message Date
Chengliang ace84c3d09 岗位序列导入功能 2024-03-12 15:26:50 +08:00
dxfeng 263af54990 分部、部门导入,自定义下拉框字段转换BUG修复 2023-12-15 18:06:32 +08:00
dxfeng 83ef5962b1 排序BUG修复 2023-10-25 15:43:27 +08:00
dxfeng d2aa83f7f0 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-10-25 15:39:27 +08:00
Chengliang 481b7dbae9 test 2023-10-25 14:08:55 +08:00
dxfeng 35cf5dc8f6 排序BUG修复 2023-10-19 11:01:00 +08:00
Chengliang 33c3b0ccaf 组织架构图改造 2023-09-13 18:04:09 +08:00
dxfeng 19b844ed89 编制信息导入重复校验 2023-09-06 17:24:32 +08:00
Chengliang 7cb3b019a8 编制模块 2023-09-06 17:17:10 +08:00
dxfeng 82d6cc74db 组织调整树BUG修复 2023-08-02 14:53:53 +08:00
Mlin 50ee698cc2 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-07-31 09:44:19 +08:00
dxfeng 87372be17f 组织管理,编制导入BUG修复 2023-07-25 16:46:08 +08:00
dxfeng fab01583ad 组织架构图,部门选择树 2023-07-24 16:38:17 +08:00
dxfeng f4c29de76b 新建编制信息初始化在编数 2023-07-24 10:32:10 +08:00
Mlin 2ee38ccc0c 版本管理代码优化 2023-07-17 14:30:44 +08:00
dxfeng a2247ddb12 TODO注释清理 2023-07-03 10:50:07 +08:00
dxfeng 13c39d5fd0 Resin编译 异常、警告处理 2023-06-21 11:42:21 +08:00
dxfeng cdd2e6384e 人员批量导入 BUG修复 2023-06-08 15:56:06 +08:00
Mlin 6cea2706df 人员简历表格动态生成 2023-06-01 09:00:55 +08:00
dxfeng e138489c34 兼容PostgreSQL 2023-05-25 08:59:51 +08:00
dxfeng db990ce227 兼容PostgreSQL 2023-05-16 16:42:28 +08:00
dxfeng f5f5c26133 人员身份证号码导入BUG修复 2023-03-01 09:54:22 +08:00
dxfeng eaca9535d5 分部、部门导入BUG修复 2023-02-07 14:41:31 +08:00
dxfeng cfe08ddf4c 花名册动态查询SQL 2023-01-09 18:06:57 +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 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 bc47f697d0 人员简历模板导出 2022-12-30 14:14:47 +08:00
dxfeng a6ed99fc60 部门导入BUG修复 2022-12-21 11:06:14 +08:00
dxfeng 665172325e 职等职级BUG修复 2022-12-20 16:52:36 +08:00
dxfeng b9cfe839e7 BUG修复 2022-12-16 16:21:54 +08:00
dxfeng 1db4a85d46 BUG修复 2022-12-15 16:13:21 +08:00
dxfeng 946354b32d BUG修复 2022-12-14 15:38:29 +08:00
dxfeng b9d06b4246 分权功能版本回退,岗位BUG修复 2022-12-13 15:57:21 +08:00
dxfeng ce2c34cfdd BUG修复,岗位关联关系调整 2022-12-13 10:42:35 +08:00
dxfeng 3470ba04cd 岗位关联关系调整 2022-12-09 14:29:20 +08:00
dxfeng 668231fd61 人员导入逻辑重写 2022-12-08 11:01:30 +08:00
dxfeng 64af65cad3 部门导入新增、更新 2022-12-06 17:11:48 +08:00
dxfeng 324881794b 分部导入新增、更新 2022-12-06 15:06:51 +08:00
dxfeng 54c3676c07 分部BUG修复,导入接口逻辑重写 2022-12-06 14:47:50 +08:00
dxfeng 85ec966813 人员卡片查看页面逻辑重写 2022-12-05 17:57:33 +08:00
dxfeng fb17f43323 部门管理功能逻辑调整 2022-11-30 16:14:23 +08:00
dxfeng bd33075e14 部门管理功能逻辑调整 2022-11-30 16:06:40 +08:00
dxfeng 40a6540a1d 部门管理功能逻辑调整 2022-11-30 15:55:27 +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