Commit Graph

52 Commits

Author SHA1 Message Date
dxfeng 3a8aa2449a 兼容PostgreSQL,简历按钮BUG修复 2023-05-29 11:35:45 +08:00
dxfeng db990ce227 兼容PostgreSQL 2023-05-16 16:42:28 +08:00
dxfeng 453d4afe97 花名册查询、导出BUG修复 2023-02-14 17:09:22 +08:00
dxfeng ec7ff05616 列定制BUG修复 2023-01-17 14:52:45 +08:00
dxfeng 5e40c18df1 列定制BUG修复 2023-01-16 15:08:22 +08:00
Mlin 58d5bccddc 花名册模板列定制列名称获取优化20230113 2023-01-13 14:07:33 +08:00
Mlin 5c44a11ff3 花名册模板列定制功能优化20230113 2023-01-13 13:44:05 +08:00
Mlin 2fba3b50b9 Merge remote-tracking branch 'origin/develop' into feature/ml
# Conflicts:
#	src/com/engine/organization/mapper/resource/HrmResourceMapper.xml
#	src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
2023-01-13 09:02:11 +08:00
Mlin e3a78a05c7 花名册模板列定制20230113 2023-01-13 08:50:27 +08:00
dxfeng ebb4e88d0d BUG修复 2023-01-12 18:18:44 +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 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 71c427d1ec 花名册自定义字段展示20230111 2023-01-11 14:48:24 +08:00
dxfeng 6e1f70ef82 花名册高级搜索BUG修复 2023-01-10 18:25:53 +08:00
dxfeng 4ba6d5c21e 花名册高级搜索BUG修复 2023-01-10 11:37:28 +08:00
dxfeng 503697dd55 花名册高级搜索相关接口 2023-01-06 17:40:23 +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 b515fdb78f 人员简历导出、压缩下载(20230105) 2023-01-05 14:55:31 +08:00
dxfeng 586330f99e 人员筛选接口开发、调整 2023-01-04 16:50:59 +08:00
dxfeng c41716318d 人员简历相关接口开发 2022-12-30 10:16:48 +08:00
dxfeng ea22378df0 人员简历相关接口开发 2022-12-29 17:49:37 +08:00
dxfeng 33e9073e1c 人员简历相关接口开发 2022-12-29 15:52:08 +08:00
dxfeng 2e39235515 人员简历相关接口开发 2022-12-28 14:13:56 +08:00
dxfeng 23eae34062 人员导出BUG 2022-12-21 13:38:53 +08:00
Chengliang 4105600770 岗位刷新功能 2022-12-15 18:56:25 +08:00
dxfeng 946354b32d BUG修复 2022-12-14 15:38:29 +08:00
dxfeng 8383c08a06 BUG修复 2022-12-13 18:19:12 +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 f7758e5298 人员导入提示信息优化 2022-11-23 09:34:06 +08:00
dxfeng ae2e5bb5a4 人员Mapper整合 2022-11-21 10:58:12 +08:00
dxfeng 81943df058 编制、分部树排序 2022-11-16 17:39:58 +08:00
dxfeng 47aafefa5a 分权BUG修复 2022-11-03 11:06:36 +08:00
dxfeng b2fc9d3e0c 人员编号、岗位部门、自定义下拉框BUG修复 2022-10-25 15:43:02 +08:00
dxfeng b7e34c1d31 人员关联调整 2022-10-20 09:07:32 +08:00
Chengliang 5445e6bfac 导出和批量导出完成 2022-06-29 16:57:45 +08:00
Chengliang 300ccd6d77 “导出修改” 2022-06-29 15:21:36 +08:00