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

936 Commits

Author SHA1 Message Date
dxfeng b1b24fc925 组织管理，移动树接口提交 2023-07-26 11:23:15 +08:00
dxfeng 9610361733 组织管理，移动树接口提交 2023-07-26 10:52:10 +08:00
dxfeng 87372be17f 组织管理，编制导入BUG修复 2023-07-25 16:46:08 +08:00
dxfeng 46ecec4b17 组织管理，岗位台账、岗位浏览按钮列表展示优化 2023-07-25 09:56:32 +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
Chengliang d9e2a695cf 排序 时间轴 2023-07-14 15:04:11 +08:00
Mlin 775405741a 版本管理，事务控制bug优化 2023-07-14 15:00:49 +08:00
Mlin 0a809a29c9 版本管理，事务控制bug优化 2023-07-14 14:46:05 +08:00
Mlin 1abbc7cddf 版本记录，未新增分部类型、部门类型字段时同步bug修复 2023-07-14 11:40:04 +08:00
Mlin 7417cbac79 虚拟维度表查询bug修复 2023-07-14 10:51:30 +08:00
Mlin 8ac0f45d29 版本记录，虚拟人员bug修复 2023-07-13 18:05:17 +08:00
Mlin 3d7b5927b3 版本记录，虚拟人员bug修复 2023-07-13 17:51:16 +08:00
Mlin 45b663217f 版本记录，分部bug修复 2023-07-13 17:16:22 +08:00
Mlin 7d1b7b8795 版本记录，虚拟人员bug修复 2023-07-13 16:58:22 +08:00
dxfeng 696f66ec98 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-07-13 15:26:24 +08:00
dxfeng d510f32bc5 组织架构图，BUG修复 2023-07-13 15:26:11 +08:00
Chengliang f5275c2148 v3 2023-07-13 15:08:24 +08:00
Mlin 725d64888c 组织管理版本记录int类型bug修复 2023-07-13 11:08:22 +08:00
Mlin 971b997dff Merge remote-tracking branch 'origin/develop' into feature/ml 
# Conflicts:
#	src/com/engine/organization/service/impl/ChartServiceImpl.java
 2023-07-12 18:04:23 +08:00
Mlin 10a9a350b4 组织管理版本记录数据同步 2023-07-12 18:00:47 +08:00
dxfeng 62b25d6a65 组织架构图，回溯详细信息 2023-07-12 17:00:01 +08:00
dxfeng c61a071746 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-07-12 16:13:21 +08:00
dxfeng 3bf299afa4 组织架构图，回溯详细信息 2023-07-12 16:13:08 +08:00
Chengliang 81f7ecfec9 列表 2023-07-12 16:09:04 +08:00
dxfeng 151e77e69b 组织架构图，回溯详细信息 2023-07-12 11:15:11 +08:00
dxfeng 104d94ba6f 组织架构图，回溯数据查询 2023-07-12 10:17:06 +08:00
dxfeng 775cf4a8ae Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-07-12 10:16:51 +08:00
Mlin 6befb0de03 Merge remote-tracking branch 'origin/develop' into feature/ml 
# Conflicts:
#	src/com/engine/organization/service/ChartService.java
#	src/com/engine/organization/service/impl/ChartServiceImpl.java
 2023-07-11 18:12:24 +08:00
Mlin 38f3e457ef 组织管理版本记录0711 2023-07-11 18:08:40 +08:00
Chengliang 1a188a1975 v3 2023-07-11 18:04:08 +08:00
dxfeng d4a6fb4a28 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-07-11 16:12:02 +08:00
dxfeng 075456caa9 组织架构图，<根结点>添加回溯联动 2023-07-11 16:11:49 +08:00
Chengliang 54abf562a4 v3 2023-07-11 16:06:23 +08:00
liang.cheng 914649a35b Merge pull request 'v3' (#185) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/185
 2023-07-11 15:25:59 +08:00
Chengliang 688eeb125c v3 2023-07-11 15:17:56 +08:00
dxfeng c023822ca5 组织架构图，兼容PG数据库 2023-07-11 11:19:19 +08:00
dxfeng a18e7a3dc7 组织架构图，添加部门层级条件 2023-07-07 14:54:21 +08:00
dxfeng eb28328219 组织架构图，岗位调整为查询聚才林岗位 2023-07-07 10:19:59 +08:00
dxfeng d9ea8fe266 修复并发情况下，岗位数据重复问题 2023-07-06 17:03:31 +08:00
dxfeng d2e1cacfa1 组织架构图，人员列表添加key 2023-07-06 14:10:39 +08:00
dxfeng 7809f9ad3c 组织架构图，人员头像 2023-07-06 13:55:48 +08:00
dxfeng 436decbc85 组织架构图，人员列表显示转换调整 2023-07-06 13:30:39 +08:00
dxfeng 38656dde58 组织架构图，部门负责人、主次账号 2023-07-06 10:47:34 +08:00
dxfeng 79f64f7f93 组织架构图，列表字段转换、卡片在岗数统计 2023-07-06 10:06:38 +08:00
dxfeng 49036ba704 组织架构图，人员卡片 2023-07-05 18:13:43 +08:00
dxfeng 603f7f606a 组织架构图，人员卡片 2023-07-05 17:54:58 +08:00
dxfeng 5559a4322a Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-07-05 17:41:47 +08:00
dxfeng e760eae9a0 组织架构图，人员卡片 2023-07-05 17:41:30 +08:00
Chengliang 9ffd5c3cfb 组织架构图 2023-07-05 17:36:04 +08:00
Chengliang 2e58769c8b 组织架构图 2023-07-05 09:16:17 +08:00
dxfeng a2247ddb12 TODO注释清理 2023-07-03 10:50:07 +08:00
dxfeng c115308f9e 组织架构图重构-异步数据接口 2023-07-03 10:49:48 +08:00
dxfeng 78c4aa5127 组织架构图重构-BUG修复 2023-06-30 17:12:58 +08:00
dxfeng c993cafab4 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-06-30 16:45:19 +08:00
dxfeng 4e919dea65 组织架构图重构 2023-06-30 16:44:56 +08:00
Chengliang b963913d62 架构图 2023-06-29 17:37:05 +08:00
Chengliang 2667ab8a60 修复条件 2023-06-28 17:58:12 +08:00
Chengliang 53a295a468 虚拟组织暂存 2023-06-27 16:58:45 +08:00
dxfeng 98b85ac75f 组织树添加key字段 2023-06-27 10:24:51 +08:00
Chengliang c696835a33 搜索条件修改 2023-06-27 10:09:05 +08:00
dxfeng e8d6f2ea73 组织架构图搜索条件优化 2023-06-27 09:12:41 +08:00
dxfeng 0148d99314 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-06-26 17:03:51 +08:00
Chengliang 35d7a045e2 组织架构图V3 2023-06-26 17:00:12 +08:00
dxfeng 13c39d5fd0 Resin编译 异常、警告处理 2023-06-21 11:42:21 +08:00
dxfeng a1dd6126b0 岗位新增BUG修复 2023-06-09 14:19:32 +08:00
dxfeng cdd2e6384e 人员批量导入 BUG修复 2023-06-08 15:56:06 +08:00
dxfeng 7889b866ab Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-06-01 14:18:45 +08:00
dxfeng 2ec00b7bb3 聚才林岗位新增功能 2023-06-01 14:12:12 +08:00
Mlin f04216a113 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-06-01 09:01:18 +08:00
Mlin 6cea2706df 人员简历表格动态生成 2023-06-01 09:00:55 +08:00
dxfeng 3a8aa2449a 兼容PostgreSQL,简历按钮BUG修复 2023-05-29 11:35:45 +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 0ca51f58ae 花名册列表按钮权限优化 2023-04-03 10:06:02 +08:00
Mlin 472cc4ab9a 人大金仓版本bug处理 2023-03-24 14:24:55 +08:00
dxfeng f8b60493f8 花名册人员状态查询功能优化 2023-03-01 16:26:10 +08:00
dxfeng f5f5c26133 人员身份证号码导入BUG修复 2023-03-01 09:54:22 +08:00
dxfeng 2d63ca20a7 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-02-20 14:33:39 +08:00
dxfeng cb41ff1f8c 岗位浏览按钮SQL完善 2023-02-20 14:28:25 +08:00
Mlin 41fdd36997 透视图在岗数bug修复 2023-02-14 18:06:00 +08:00
dxfeng 453d4afe97 花名册查询、导出BUG修复 2023-02-14 17:09:22 +08:00
dxfeng 4113df1708 简历树，聚才林岗位搜索BUG修复 2023-02-08 14:05:33 +08:00
dxfeng eaca9535d5 分部、部门导入BUG修复 2023-02-07 14:41:31 +08:00
dxfeng 559ea407ab 岗位分权，部门列表BUG修复 2023-02-07 11:29:13 +08:00
dxfeng 6ac651e8bd 花名册，状态查询功能完善 2023-02-06 09:49:36 +08:00
dxfeng ec7ff05616 列定制BUG修复 2023-01-17 14:52:45 +08:00
dxfeng 37ded0a19b 列定制BUG修复 2023-01-17 09:30:51 +08:00
dxfeng 8947e6da3a 列定制BUG修复 2023-01-16 17:19:59 +08:00
dxfeng 5e40c18df1 列定制BUG修复 2023-01-16 15:08:22 +08:00
Mlin 4b4754bd74 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-01-13 18:40:39 +08:00
Mlin 2b5acfeb32 花名册模板管理bug修复 2023-01-13 18:40:34 +08:00
dxfeng 7dc6225356 Merge pull request 'BUG修复' (#145) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/145
 2023-01-13 18:11:57 +08:00
dxfeng ba2909bac9 BUG修复 2023-01-13 18:10:57 +08:00
Mlin 8ff8340d81 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-01-13 18:03:32 +08:00
Mlin 9d36b42da6 花名册模板管理日期优化 2023-01-13 18:03:19 +08:00
dxfeng 0aac4a0c57 BUG修复 2023-01-13 18:01:17 +08:00
dxfeng ec55baf5fe BUG修复 2023-01-13 17:39:52 +08:00
dxfeng 6d8aaf063b BUG修复 2023-01-13 16:50:54 +08:00
Mlin 547264d755 花名册模板列定制优化20230113 2023-01-13 16:37:11 +08:00
Mlin 78682a47c7 花名册模板列定制优化20230113 2023-01-13 16:35:34 +08:00
Mlin 58d5bccddc 花名册模板列定制列名称获取优化20230113 2023-01-13 14:07:33 +08:00
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 1bb7b67133 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-01-13 09:47:15 +08:00
dxfeng 1c9dce7c0b BUG修复 2023-01-13 09:46:37 +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 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