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

373 Commits

Author SHA1 Message Date
Mlin 07a82baf9c Merge remote-tracking branch 'origin/develop' into feature/ml 2023-01-13 13:44:15 +08:00
Mlin 5c44a11ff3 花名册模板列定制功能优化20230113 2023-01-13 13:44:05 +08:00
dxfeng 1c9dce7c0b BUG修复 2023-01-13 09:46:37 +08:00
dxfeng f79ad8681f BUG修复 2023-01-12 16:49:54 +08:00
dxfeng 15b14cf4b1 显示定制列穿梭框接口开发 2023-01-12 15:45:43 +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 12bcd367c7 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-01-11 09:07:46 +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 cfe08ddf4c 花名册动态查询SQL 2023-01-09 18:06:57 +08:00
dxfeng 01c042ebbc 高级搜索表单完善 2023-01-09 10:27:30 +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 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 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 347e3505d1 多个部门负责人存入版本bug修复 2022-12-21 16:26:21 +08:00
dxfeng b7938cfb6b 多部门负责人BUG修复 2022-12-20 18:17:40 +08:00
Mlin 30898d0eee oracle环境存入版本bug修复、新增职等职级1220 2022-12-20 09:02:51 +08:00
Mlin a5cc902c10 oracle环境存入版本bug修复 2022-12-16 18:31:50 +08:00
dxfeng b9cfe839e7 BUG修复 2022-12-16 16:21:54 +08:00
liang.cheng afa66c74c1 Merge pull request '岗位刷新功能' (#100) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/100
 2022-12-15 18:58:33 +08:00
Mlin 95d53a6d8c Merge remote-tracking branch 'origin/develop' into feature/ml 2022-12-15 18:57:44 +08:00
Mlin faaed265fe 版本查询接口初版 2022-12-15 18:57:32 +08:00
Chengliang 4105600770 岗位刷新功能 2022-12-15 18:56:25 +08:00
dxfeng e26e780310 Merge pull request 'BUG修复' (#98) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/98
 2022-12-15 16:57:09 +08:00
dxfeng 1db4a85d46 BUG修复 2022-12-15 16:13:21 +08:00
Mlin b3057e2f4e 版本查询接口 2022-12-15 14:38:48 +08:00
Mlin 7f51135424 定时任务 2022-12-14 17:42:59 +08:00
dxfeng 946354b32d BUG修复 2022-12-14 15:38:29 +08:00
dxfeng 4117a34928 BUG修复 2022-12-14 10:52:20 +08:00
dxfeng b9d06b4246 分权功能版本回退，岗位BUG修复 2022-12-13 15:57:21 +08:00
dxfeng fab4614cd5 分权功能重构，调用EC方法 2022-12-13 10:58:57 +08:00
dxfeng ce2c34cfdd BUG修复,岗位关联关系调整 2022-12-13 10:42:35 +08:00
dxfeng 6169b007ae Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-09 17:05:01 +08:00
Mlin 1bdc7e2fa4 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-12-09 16:04:50 +08:00
Mlin 13ae136872 部门版本控制写入逻辑 2022-12-09 16:04:35 +08:00
dxfeng 45a24cb0be BUG修复,岗位关联关系调整 2022-12-09 15:39:15 +08:00
dxfeng 06c9912d21 BUG修复,岗位关联关系调整 2022-12-09 15:07:34 +08:00
dxfeng dee6bb25b5 岗位关联关系调整 2022-12-09 14:29:56 +08:00
dxfeng 3470ba04cd 岗位关联关系调整 2022-12-09 14:29:20 +08:00
Mlin 73dbaf75ac 分部版本控制写入逻辑 2022-12-09 08:50:23 +08:00
dxfeng c1c812596d BUG修复 2022-12-08 17:10:31 +08:00
dxfeng f89ebdb965 分部、部门联调。BUG修复 2022-12-08 14:16:58 +08:00
dxfeng a1f2c9d1ac BUG修复 2022-12-08 11:24:48 +08:00
dxfeng de03ca3b8b 部门列表BUG修复 2022-12-07 14:15:02 +08:00
dxfeng 3477539393 部门列表BUG修复 2022-12-07 14:08:03 +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 bd33075e14 部门管理功能逻辑调整 2022-11-30 16:06:40 +08:00
dxfeng 40a6540a1d 部门管理功能逻辑调整 2022-11-30 15:55:27 +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 7d1fc84fad 组织架构树排序、人员卡片BUG修复 2022-11-18 16:28:02 +08:00
dxfeng 17f4789e33 BUG修复 2022-11-16 14:59:22 +08:00
dxfeng 67fd2df4f9 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-11-16 14:58:48 +08:00
Chengliang cb4db723e4 “栏目表格修复” 2022-11-16 14:06:12 +08:00
dxfeng 05364f9265 BUG修复 2022-11-16 13:39:56 +08:00
dxfeng 4fc2eca27b 花名册树、角色展示BUG 2022-11-15 11:47:54 +08:00
dxfeng 7c79718d6e 人员卡片，修改字段名 2022-11-14 14:05:48 +08:00
dxfeng 3ec8afe78b 人员卡片，明细表展示 2022-11-14 13:56:19 +08:00
dxfeng 7b5a4905dc BUG修复、卡片按钮排序 2022-11-14 11:19:08 +08:00
dxfeng 16794bf98c 人员卡片按钮保存 2022-11-11 16:24:26 +08:00
dxfeng 57d788d807 人员卡片按钮权限 2022-11-11 09:09:53 +08:00
Chengliang eeefde07ed 接口 2022-11-10 10:29:03 +08:00
dxfeng 466ba43b31 人员卡片类别展示权限控制 2022-11-09 16:58:09 +08:00
dxfeng a6952f41b0 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-11-09 11:13:55 +08:00
dxfeng b0021dae20 字段允许个人修改 2022-11-09 11:07:55 +08:00
liang.cheng c2a1908c10 Merge pull request 'bug修复' (#44) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/44
 2022-11-09 09:54:03 +08:00
Chengliang 99f849f350 bug修复 2022-11-09 09:45:19 +08:00
dxfeng a3a0ce8046 岗位按钮、人员字段权限 2022-11-08 17:26:59 +08:00
dxfeng c03a7c599a 岗位按钮、组织架构图 BUG修复 2022-11-08 15:21:29 +08:00
Chengliang afcbbcefb1 人员卡片权限接口 2022-11-02 17:44:52 +08:00
liang.cheng 121927dba8 Merge pull request '人员卡片类型权限' (#35) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/35
 2022-11-02 11:31:54 +08:00
Chengliang b636dc2b82 人员卡片类型权限 2022-11-02 11:29:40 +08:00
liang.cheng ac5eb30534 Merge pull request '人员卡片权限' (#33) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/33
 2022-11-01 17:55:07 +08:00
Chengliang 4e4cf54f8a 人员卡片权限 2022-11-01 17:53:31 +08:00
dxfeng 895528617b 分部、部门、岗位、人员 分权功能开发 2022-11-01 10:05:43 +08:00
dxfeng 0b3cd0641b 分权开发 2022-10-28 17:43:46 +08:00
liang.cheng 19cccb9345 Merge pull request 'feature/detach' (#29) from feature/detach into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/29
 2022-10-28 09:36:40 +08:00
dxfeng 3989161281 组织架构图相关BUG修复 2022-10-27 19:11:58 +08:00
Chengliang ef392f4d0a 模块管理分权 2022-10-27 15:00:12 +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