liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,679 Commits 23 Branches 0 Tags 6.7 MiB
Commit Graph

226 Commits

Author SHA1 Message Date
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
Chengliang 4e4cf54f8a 人员卡片权限 2022-11-01 17:53:31 +08:00
Chengliang 1e08772a9d 分权开关设置 2022-10-28 17:41:56 +08:00
Chengliang 96cefec891 模块管理分权 2022-10-27 14:58:44 +08:00
Chengliang f6ea4425cf 模块管理分权 2022-10-27 14:58:44 +08:00
Chengliang 4c74b583bf 模块管理分权 2022-10-27 14:58:44 +08:00
Chengliang 2b975e6636 模块管理分权中心接口 2022-10-27 14:58:44 +08:00
dxfeng 231addfda1 人事卡片接口开发 2022-10-09 11:42:26 +08:00
Chengliang 61aabb4ca1 测试 2022-09-20 14:24:26 +08:00
dxfeng b494a6a96e BUG修复 2022-09-16 11:01:31 +08:00
dxfeng 50e5c7312e 编制导入 2022-09-15 16:51:35 +08:00
dxfeng 35439a442f BUG 修复 2022-09-15 10:41:04 +08:00
dxfeng 0a87a2ad4d Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-09-07 19:17:10 +08:00
Chengliang c280c5f908 fixed 2022-09-07 19:12:42 +08:00
dxfeng 59f76c012c 触发器，分部、部门赋值，SQL脚本 2022-09-07 15:40:19 +08:00
dxfeng b49a25742a 触发器、非标开关 2022-09-01 16:57:06 +08:00
dxfeng 532a6d00ce 人员信息分类 2022-08-29 09:22:45 +08:00
dxfeng 6351109b79 人员信息分类 2022-08-26 17:36:26 +08:00
Chengliang ca7d34a5bd 人员信息模块 2022-08-24 17:57:04 +08:00
Chengliang 8043012b41 人基础员信息 2022-08-23 17:51:20 +08:00
dxfeng 5cce107318 BUG修复，权限控制 2022-08-18 14:27:16 +08:00
dxfeng 3acec4730d BUG修复，权限控制 2022-08-17 19:29:46 +08:00
dxfeng f27612db94 Oracle BUG修复 2022-08-11 10:43:52 +08:00
dxfeng 6576335c6c BUG修复 2022-08-10 15:37:23 +08:00
dxfeng 0e3fc1a238 同步CusFieldData数据接口 2022-08-02 16:25:21 +08:00
dxfeng ceb3484d6d 编制方案需求完善 2022-08-02 15:10:36 +08:00
dxfeng 0a47b3548d 人员导入 2022-07-29 16:20:59 +08:00
dxfeng fc8aaf7729 部门导入、日志记录 2022-07-27 10:48:43 +08:00
dxfeng c23127acc2 分部导入、日志记录 2022-07-27 09:22:15 +08:00
dxfeng b1365da225 分部导入 2022-07-26 16:33:41 +08:00
dxfeng 9d304b0303 分部导入 2022-07-26 09:40:13 +08:00
MustangDeng cc318fa73c Merge branch 'feature/djp' into develop 2022-07-21 11:57:29 +08:00
MustangDeng 0a1e6c6e7d feature: 组织架构异步数据v1.0 2022-07-21 11:01:36 +08:00
Chengliang a1ed3e45c9 需求优化2 2022-07-13 09:20:21 +08:00
dxfeng 81fcd96af6 人员拓展卡片 2022-07-11 15:59:15 +08:00
670124965@qq.com 58f3aedf9d Merge branch 'feature/djp' into develop 2022-07-08 11:38:16 +08:00
dxfeng 40a7c066a2 记录操作日志 2022-07-07 14:19:56 +08:00
MustangDeng b589056585 组织结构图接口 2022-07-07 10:14:25 +08:00
dxfeng cca52d7080 记录操作日志 2022-07-06 11:44:07 +08:00
dxfeng 278194a4a3 记录操作日志,岗位优化 2022-07-05 18:44:45 +08:00
dxfeng f5d95fabb2 记录操作日志 2022-07-05 15:15:00 +08:00
Chengliang 46aeddea39 需求调整 2022-07-04 17:51:31 +08:00
dxfeng 03f59d55d0 人员列表查询系统表 异常信息处理 2022-07-04 09:18:56 +08:00
dxfeng 5291c3b855 分部列表BUG修复 2022-07-01 17:46:25 +08:00
reset be94ae88e7
!129 1 
Merge pull request !129 from reset/feature/cl
 2022-06-29 08:59:32 +00:00
Chengliang 5445e6bfac 导出和批量导出完成 2022-06-29 16:57:45 +08:00
Chengliang 300ccd6d77 “导出修改” 2022-06-29 15:21:36 +08:00
dxfeng 9b54954ef8 人员导入 2022-06-29 14:50:11 +08:00
dxfeng 48171c7e82 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-06-29 14:21:17 +08:00
Chengliang 783b9fc6bf 人员导出 2022-06-29 14:18:47 +08:00
dxfeng 5ceb8ae068 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-06-29 14:16:39 +08:00
Chengliang 0ad6157c26 人员导出功能 2022-06-28 19:04:14 +08:00
dxfeng 4eef6f62de 人员导入 2022-06-28 10:47:11 +08:00
dxfeng d0ea50cec5 部门、岗位 合并 2022-06-24 18:26:15 +08:00
dxfeng db4e066294 复制分部 表结构更新 2022-06-24 16:14:13 +08:00
dxfeng 2ea923f9c9 转移分部 2022-06-24 14:22:10 +08:00
dxfeng f72db1b5f9 组织人事测试、优化 2022-06-22 11:22:51 +08:00
dxfeng bdc813000e 人员管理查询条件 按钮接口， 
是否禁用名称更改
 2022-06-21 17:50:56 +08:00
dxfeng 5b6cf8fe72 人员管理新增、编辑相关接口 2022-06-21 16:47:39 +08:00
dxfeng 187be45bdf 人员管理：左侧树、列表接口 2022-06-21 13:49:37 +08:00
dxfeng 2af1fb6336 移动到组 2022-06-20 09:09:14 +08:00
dxfeng 6df1accb98 BUG 修复 2022-06-17 16:54:16 +08:00
dxfeng 84adef0520 表结构更新 2022-06-17 11:48:32 +08:00
dxfeng e9aa68229d 表结构更新 2022-06-17 11:48:15 +08:00
dxfeng 445507d10d 表结构更新 2022-06-17 10:54:59 +08:00
dxfeng c8604a8e40 数据返回格式修改 2022-06-17 09:45:32 +08:00
dxfeng 9aebfbcecc 字段删除 移动分组 2022-06-16 18:26:12 +08:00