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

816 Commits

Author SHA1 Message Date
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
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 06da61d889 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-01-03 11:41:33 +08:00
Mlin 6d1603aeb2 人员简历模板导出20230103 2023-01-03 11:41:21 +08:00
dxfeng bccae91e75 人员简历模板优化 2023-01-03 10:32:11 +08:00
dxfeng 395d93067a Oracle,SQL脚本BUG修复 2023-01-03 10:01:19 +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 a86a8dd2c8 人员简历模板导出 2022-12-30 14:19:16 +08:00
Mlin bc47f697d0 人员简历模板导出 2022-12-30 14:14:47 +08:00
dxfeng dde1d0d0db 人员简历相关接口开发 2022-12-30 10:40:42 +08:00
dxfeng 687b580494 人员简历相关接口开发 2022-12-30 10:38:47 +08:00
dxfeng df57b4e71f 人员简历相关接口开发 2022-12-30 10:20:08 +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 950da74ac8 人员岗位显示bug修复 2022-12-22 11:26:09 +08:00
Mlin 347e3505d1 多个部门负责人存入版本bug修复 2022-12-21 16:26:21 +08:00
Mlin 7b9a82dda9 多部门负责人截取显示bug修复 2022-12-21 15:45:49 +08:00
Mlin 4a0949b6b1 多部门负责人截取显示bug修复 2022-12-21 15:13:16 +08:00
Mlin 18b50a4431 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-12-21 14:54:07 +08:00
Mlin d231bf3bd3 多部门负责人截取显示 2022-12-21 14:53:56 +08:00
dxfeng 8c6becc29c Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-21 13:41:42 +08:00
Mlin fbac015a99 部门转移岗位重复bug修复 2022-12-21 13:40:19 +08:00
dxfeng 23eae34062 人员导出BUG 2022-12-21 13:38:53 +08:00
dxfeng a6ed99fc60 部门导入BUG修复 2022-12-21 11:06:14 +08:00
Mlin 33106aaaec sqlserver版本存入、部门转移 2022-12-21 10:58:49 +08:00
dxfeng b7938cfb6b 多部门负责人BUG修复 2022-12-20 18:17:40 +08:00
dxfeng 4ca7eeb93c Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-20 16:52:52 +08:00
dxfeng 665172325e 职等职级BUG修复 2022-12-20 16:52:36 +08:00
Mlin 6dcb5db15f 动态字段查询 2022-12-20 15:36:39 +08:00
dxfeng 30bec2120a Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-20 13:53:35 +08:00
dxfeng 31a26dec08 部门合并、转移。岗位同步BUG修复 2022-12-20 13:53:18 +08:00
Mlin b8158cdcec oracle版数据同步问题 2022-12-20 10:57:46 +08:00
dxfeng ebf7a1bdda Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-20 09:28:39 +08:00
dxfeng e7cc13ed60 BUG修复 2022-12-20 09:13:11 +08:00
Mlin 30898d0eee oracle环境存入版本bug修复、新增职等职级1220 2022-12-20 09:02:51 +08:00
Mlin 0128de79ea oracle环境存入版本bug修复、新增职等职级1219 2022-12-19 19:24:28 +08:00
dxfeng 2b0c1d0a69 BUG修复 2022-12-19 16:00:47 +08:00
dxfeng d21d3148bf Oracle版本BUG修复 2022-12-19 11:34:53 +08:00
Mlin 5bcd3e22fc oracle环境存入版本bug修复1219 2022-12-19 08:44:37 +08:00
Mlin 806d18e511 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-12-16 18:32:18 +08:00
Mlin a5cc902c10 oracle环境存入版本bug修复 2022-12-16 18:31:50 +08:00
dxfeng b11251701a BUG修复 2022-12-16 18:29:12 +08:00
Mlin afe4813427 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-12-16 16:39:28 +08:00
Mlin 78d08ea740 无历史版本返回为空 2022-12-16 16:39:09 +08:00
dxfeng c86e37495d Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-16 16:26:01 +08:00
dxfeng b9cfe839e7 BUG修复 2022-12-16 16:21:54 +08:00
Mlin 78dfc87f61 同步数据接口 2022-12-16 15:58:20 +08:00
Mlin 0b89abeaac Merge remote-tracking branch 'origin/develop' into feature/ml 2022-12-16 14:25:48 +08:00
Mlin 981ea3ad4a 存为版本取消存入map表，同步接口 2022-12-16 14:25:30 +08:00
dxfeng 434dbacb64 根据职等职级字段，补充人员信息 2022-12-16 14:24:40 +08:00
dxfeng f428dff5a0 根据职等职级字段，补充人员信息 2022-12-16 13:53:47 +08:00
Mlin 8cda66dc8b bug修复 2022-12-15 20:29:58 +08:00
Mlin 241bf47710 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-12-15 19:52:04 +08:00
Mlin 184a9e375f 版本查询接口二版 2022-12-15 19:51:04 +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
Chengliang 4d8948724e 岗位增加刷新按钮 2022-12-15 16:58:08 +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 569a3132c1 分部、部门、人员封存后取消架构图展示 2022-12-15 15:16:40 +08:00
Mlin 3be6bf11a2 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-12-15 14:39:06 +08:00
Mlin b3057e2f4e 版本查询接口 2022-12-15 14:38:48 +08:00
Mlin 3462511603 showOrder类型小数转换 2022-12-15 09:59:57 +08:00
dxfeng 550be7fb14 BUG修复 2022-12-15 09:49:55 +08:00
Mlin 7f51135424 定时任务 2022-12-14 17:42:59 +08:00
dxfeng 42545745fe Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-14 15:38:59 +08:00
dxfeng 946354b32d BUG修复 2022-12-14 15:38:29 +08:00
Mlin 1db1949a94 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-12-14 14:32:40 +08:00
Mlin 43f00f7d9d sqlserver存入版本修复、定时任务 2022-12-14 14:32:19 +08:00
dxfeng d2f6fa693a Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-14 10:58:09 +08:00
dxfeng 4117a34928 BUG修复 2022-12-14 10:52:20 +08:00
dxfeng 8383c08a06 BUG修复 2022-12-13 18:19:12 +08:00
Mlin 9c80a74386 oracle、sqlserver查询版本语句(部门存入失败) 2022-12-13 16:38:06 +08:00
dxfeng b9d06b4246 分权功能版本回退，岗位BUG修复 2022-12-13 15:57:21 +08:00
Mlin 5897ae1563 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-12-13 15:01:11 +08:00
Mlin e81d8f4939 oracle、sqlserver查询版本语句 2022-12-13 14:58:22 +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 32fd42db2f Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-12-12 18:11:59 +08:00
dxfeng b64f15bd83 BUG修复,岗位关联关系调整 2022-12-12 18:11:03 +08:00
Mlin 2b549bcc4a 人员版本控制写入逻辑 2022-12-12 17:55:50 +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 32e8eb4890 分部、部门版本控制写入逻辑 2022-12-09 16:57:42 +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 b368c3ea27 BUG修复 2022-12-08 17:10:50 +08:00
dxfeng c1c812596d BUG修复 2022-12-08 17:10:31 +08:00
dxfeng eaa1c53c9c 分部、部门联调。BUG修复 2022-12-08 14:37:48 +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 ea8a48099f Merge pull request '人员导入逻辑重写' (#87) from feature/dxf into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/87
 2022-12-08 11:04:35 +08:00
dxfeng 668231fd61 人员导入逻辑重写 2022-12-08 11:01:30 +08:00
Chengliang d345a5fe66 版本管理 2022-12-08 09:56:25 +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 37dc31b7b5 部门查看、编辑接口调整 2022-12-07 11:49:06 +08:00
dxfeng 6fc67d7d67 分部查看、编辑接口调整 2022-12-07 10:36:05 +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 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