Commit Graph

378 Commits (33c3b0ccaf9e98b6d11adcc9864af8d5f7175277)

Author SHA1 Message Date
Mlin a395024010 Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
Mlin a677da06a6 花名册模板管理查询、编辑保存20230112 2 years ago
dxfeng b93a3d7b1c Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng a7b1f33e1a 显示定制列穿梭框接口开发 2 years ago
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
2 years ago
Mlin 8750850dfa 花名册列定制模板查询20230112 2 years ago
Mlin 09d4dbddd5 花名册列定制模板查询20230112 2 years ago
dxfeng 0f73f6e3ac 显示定制列穿梭框接口开发 2 years ago
dxfeng d5ca665f2f 显示定制列穿梭框接口开发 2 years ago
Mlin f86562c802 Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
Mlin 71c427d1ec 花名册自定义字段展示20230111 2 years ago
dxfeng 4076a755f1 花名册高级搜索BUG修复 2 years ago
dxfeng 6e1f70ef82 花名册高级搜索BUG修复 2 years ago
dxfeng 4ba6d5c21e 花名册高级搜索BUG修复 2 years ago
dxfeng 503697dd55 花名册高级搜索相关接口 2 years ago
dxfeng 3e0d3a1b2e 花名册高级搜索相关接口 2 years ago
dxfeng 4d43e0605b Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng 92c51cfe18 花名册高级搜索相关接口 2 years ago
Mlin 00ab437f9e 增加全部人员简历下载条件(去除离职)(20230106) 2 years ago
Mlin b515fdb78f 人员简历导出、压缩下载(20230105) 2 years ago
dxfeng 586330f99e 人员筛选接口开发、调整 2 years ago
dxfeng 395d93067a Oracle,SQL脚本BUG修复 2 years ago
dxfeng c41716318d 人员简历相关接口开发 2 years ago
dxfeng ea22378df0 人员简历相关接口开发 2 years ago
dxfeng 33e9073e1c 人员简历相关接口开发 2 years ago
dxfeng 2e39235515 人员简历相关接口开发 2 years ago
Mlin 7b9a82dda9 多部门负责人截取显示bug修复 2 years ago
Mlin 4a0949b6b1 多部门负责人截取显示bug修复 2 years ago
Mlin 18b50a4431 Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
Mlin d231bf3bd3 多部门负责人截取显示 2 years ago
dxfeng 8c6becc29c Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
Mlin fbac015a99 部门转移岗位重复bug修复 2 years ago
dxfeng 23eae34062 人员导出BUG 2 years ago
Mlin 33106aaaec sqlserver版本存入、部门转移 2 years ago
dxfeng b7938cfb6b 多部门负责人BUG修复 2 years ago
Mlin 6dcb5db15f 动态字段查询 2 years ago
Mlin b8158cdcec oracle版数据同步问题 2 years ago
Mlin 30898d0eee oracle环境存入版本bug修复、新增职等职级1220 2 years ago
Mlin 0128de79ea oracle环境存入版本bug修复、新增职等职级1219 2 years ago
dxfeng 2b0c1d0a69 BUG修复 2 years ago
dxfeng d21d3148bf Oracle版本BUG修复 2 years ago
Mlin 5bcd3e22fc oracle环境存入版本bug修复1219 2 years ago
Mlin 806d18e511 Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
Mlin a5cc902c10 oracle环境存入版本bug修复 2 years ago
dxfeng b11251701a BUG修复 2 years ago
dxfeng c86e37495d Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng b9cfe839e7 BUG修复 2 years ago
Mlin 78dfc87f61 同步数据接口 2 years ago
Mlin 981ea3ad4a 存为版本取消存入map表,同步接口 2 years ago
Mlin 241bf47710 Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
Mlin 184a9e375f 版本查询接口二版 2 years ago
liang.cheng afa66c74c1 Merge pull request '岗位刷新功能' (#100) from feature/cl into develop
Reviewed-on: #100
2 years ago
Mlin 95d53a6d8c Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
Mlin faaed265fe 版本查询接口初版 2 years ago
Chengliang 4105600770 岗位刷新功能 2 years ago
dxfeng e26e780310 Merge pull request 'BUG修复' (#98) from feature/dxf into develop
Reviewed-on: #98
2 years ago
dxfeng 1db4a85d46 BUG修复 2 years ago
Mlin b3057e2f4e 版本查询接口 2 years ago
Mlin 3462511603 showOrder类型小数转换 2 years ago
Mlin 7f51135424 定时任务 2 years ago
dxfeng 42545745fe Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng 946354b32d BUG修复 2 years ago
Mlin 1db1949a94 Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
Mlin 43f00f7d9d sqlserver存入版本修复、定时任务 2 years ago
dxfeng d2f6fa693a Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng 4117a34928 BUG修复 2 years ago
dxfeng 8383c08a06 BUG修复 2 years ago
Mlin 9c80a74386 oracle、sqlserver查询版本语句(部门存入失败) 2 years ago
dxfeng b9d06b4246 分权功能版本回退,岗位BUG修复 2 years ago
Mlin 5897ae1563 Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
Mlin e81d8f4939 oracle、sqlserver查询版本语句 2 years ago
dxfeng fab4614cd5 分权功能重构,调用EC方法 2 years ago
dxfeng 6169b007ae Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
Mlin 32e8eb4890 分部、部门版本控制写入逻辑 2 years ago
Mlin 1bdc7e2fa4 Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
Mlin 13ae136872 部门版本控制写入逻辑 2 years ago
dxfeng 06c9912d21 BUG修复,岗位关联关系调整 2 years ago
dxfeng 3470ba04cd 岗位关联关系调整 2 years ago
Mlin 73dbaf75ac 分部版本控制写入逻辑 2 years ago
dxfeng c1c812596d BUG修复 2 years ago
dxfeng f89ebdb965 分部、部门联调。BUG修复 2 years ago
Chengliang d345a5fe66 版本管理 2 years ago
dxfeng 64af65cad3 部门导入新增、更新 2 years ago
dxfeng 54c3676c07 分部BUG修复,导入接口逻辑重写 2 years ago
dxfeng 85ec966813 人员卡片查看页面逻辑重写 2 years ago
dxfeng bd33075e14 部门管理功能逻辑调整 2 years ago
dxfeng 40a6540a1d 部门管理功能逻辑调整 2 years ago
dxfeng 238d8e6f75 部门接口逻辑调整 2 years ago
dxfeng 9a2eabc8bd 部门切换数据源、实体类更新 2 years ago
dxfeng aa3d0742ff 分部接口整理、代码优化 2 years ago
dxfeng 416471a283 分部列表、新增、删除、转移功能重写 2 years ago
dxfeng f7758e5298 人员导入提示信息优化 2 years ago
dxfeng ae2e5bb5a4 人员Mapper整合 2 years ago
dxfeng 7d1fc84fad 组织架构树排序、人员卡片BUG修复 2 years ago
dxfeng a273008715 导入BUG,提示信息优化 2 years ago
dxfeng 81943df058 编制、分部树排序 2 years ago
dxfeng 9b20c6838a 人事卡片按钮权限BUG 2 years ago
dxfeng 17f4789e33 BUG修复 2 years ago
dxfeng 05364f9265 BUG修复 2 years ago
dxfeng 10bb8159aa 明细表BUG修复 2 years ago