Commit Graph

419 Commits (760b54710ad409af79799ec49baa90590f98b86d)

Author SHA1 Message Date
Chengliang 498da847b3 编制模块修改 2 years ago
Chengliang 51dc953766 企通学配置 2 years ago
Chengliang a94cdc7e37 企通学配置自定义 2 years ago
Chengliang bb68a3bc7a 企通学单点 2 years ago
liang.cheng e4c1f4dba6 Merge pull request '11' (#205) from feature/cl into develop
Reviewed-on: #205
2 years ago
Chengliang b1d506cf15 11 2 years ago
dxfeng 79b395fc37 等级方案、职等分权 2 years ago
dxfeng 16cb2c844d 快捷搜索条件表单 2 years ago
dxfeng 5a71b861fd 快捷搜索条件表单 2 years ago
dxfeng 4438f3937a 快捷搜索条件表单 2 years ago
dxfeng 55a22e8038 快捷搜索自定义接口BUG修复 2 years ago
dxfeng 53e96cafe5 recordSet调整成MyBatis 2 years ago
dxfeng dacd9b180e 快捷搜索基本代码提交 2 years ago
dxfeng 8a3885db76 人员动态列导出 2 years ago
dxfeng 853bf4b006 组织架构树、部门台账优化;岗位同步逻辑重写 2 years ago
dxfeng 647f692920 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng 04826fcaa4 组织管理,树结构展开功能完善 2 years ago
Mlin 63491e9906 部门拖拽转移优化 2 years ago
dxfeng 9a6f0a845e 组织管理,架构图树排序、BUG修复 2 years ago
dxfeng ea4a3201aa 组织管理,架构图部门树选择数据接口 2 years ago
dxfeng e011880672 组织管理,树结构禁用非部门节点 2 years ago
dxfeng 59d4fac4e2 组织管理,部门封存传参,树结构优化 2 years ago
dxfeng 29bfcdc418 组织管理,分部封存传参 2 years ago
dxfeng 3fa679b139 组织管理,树结构兼容是否封存 2 years ago
dxfeng 1280b3c6b9 组织管理,TreeSelect组件全量接口开发 2 years ago
dxfeng 9610361733 组织管理,移动树接口提交 2 years ago
dxfeng 46ecec4b17 组织管理,岗位台账、岗位浏览按钮列表展示优化 2 years ago
dxfeng d510f32bc5 组织架构图,BUG修复 2 years ago
Chengliang 1a188a1975 v3 2 years ago
dxfeng a18e7a3dc7 组织架构图,添加部门层级条件 2 years ago
dxfeng d2e1cacfa1 组织架构图,人员列表添加key 2 years ago
dxfeng 7809f9ad3c 组织架构图,人员头像 2 years ago
dxfeng 436decbc85 组织架构图,人员列表显示转换调整 2 years ago
dxfeng 38656dde58 组织架构图,部门负责人、主次账号 2 years ago
dxfeng 79f64f7f93 组织架构图,列表字段转换、卡片在岗数统计 2 years ago
Chengliang 2e58769c8b 组织架构图 2 years ago
dxfeng a2247ddb12 TODO注释清理 2 years ago
dxfeng c993cafab4 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng 4e919dea65 组织架构图重构 2 years ago
Chengliang b963913d62 架构图 2 years ago
Chengliang 53a295a468 虚拟组织暂存 2 years ago
dxfeng 98b85ac75f 组织树添加key字段 2 years ago
dxfeng e8d6f2ea73 组织架构图搜索条件优化 2 years ago
dxfeng 13c39d5fd0 Resin编译 异常、警告处理 2 years ago
dxfeng 559ea407ab 岗位分权,部门列表BUG修复 2 years ago
Mlin 78682a47c7 花名册模板列定制优化20230113 3 years ago
Mlin 07a82baf9c Merge remote-tracking branch 'origin/develop' into feature/ml 3 years ago
Mlin 5c44a11ff3 花名册模板列定制功能优化20230113 3 years ago
dxfeng 1c9dce7c0b BUG修复 3 years ago
dxfeng f79ad8681f BUG修复 3 years ago
dxfeng 15b14cf4b1 显示定制列穿梭框接口开发 3 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
3 years ago
Mlin 8750850dfa 花名册列定制模板查询20230112 3 years ago
Mlin 09d4dbddd5 花名册列定制模板查询20230112 3 years ago
dxfeng 0f73f6e3ac 显示定制列穿梭框接口开发 3 years ago
dxfeng d5ca665f2f 显示定制列穿梭框接口开发 3 years ago
Mlin 12bcd367c7 Merge remote-tracking branch 'origin/develop' into feature/ml 3 years ago
dxfeng 832fb2b9c4 花名册高级搜索BUG修复 3 years ago
dxfeng f7ce6b028a 花名册高级搜索BUG修复 3 years ago
dxfeng cfe08ddf4c 花名册动态查询SQL 3 years ago
dxfeng 01c042ebbc 高级搜索表单完善 3 years ago
Mlin 1c3b1296b5 Merge remote-tracking branch 'origin/develop' into feature/ml 3 years ago
Mlin d1612a151a 花名册自定义字段展示20230106 3 years ago
dxfeng 3e0d3a1b2e 花名册高级搜索相关接口 3 years ago
dxfeng 4d43e0605b Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng 92c51cfe18 花名册高级搜索相关接口 3 years ago
Mlin b515fdb78f 人员简历导出、压缩下载(20230105) 3 years ago
dxfeng 586330f99e 人员筛选接口开发、调整 3 years ago
dxfeng c41716318d 人员简历相关接口开发 3 years ago
dxfeng 702092c5a2 人员简历相关接口开发 3 years ago
dxfeng ea22378df0 人员简历相关接口开发 3 years ago
dxfeng 33e9073e1c 人员简历相关接口开发 3 years ago
dxfeng b53007b7c2 人员简历相关接口开发 3 years ago
dxfeng 2e39235515 人员简历相关接口开发 3 years ago
Mlin 347e3505d1 多个部门负责人存入版本bug修复 3 years ago
dxfeng b7938cfb6b 多部门负责人BUG修复 3 years ago
Mlin 30898d0eee oracle环境存入版本bug修复、新增职等职级1220 3 years ago
Mlin a5cc902c10 oracle环境存入版本bug修复 3 years ago
dxfeng b9cfe839e7 BUG修复 3 years ago
liang.cheng afa66c74c1 Merge pull request '岗位刷新功能' (#100) from feature/cl into develop
Reviewed-on: #100
3 years ago
Mlin 95d53a6d8c Merge remote-tracking branch 'origin/develop' into feature/ml 3 years ago
Mlin faaed265fe 版本查询接口初版 3 years ago
Chengliang 4105600770 岗位刷新功能 3 years ago
dxfeng e26e780310 Merge pull request 'BUG修复' (#98) from feature/dxf into develop
Reviewed-on: #98
3 years ago
dxfeng 1db4a85d46 BUG修复 3 years ago
Mlin b3057e2f4e 版本查询接口 3 years ago
Mlin 7f51135424 定时任务 3 years ago
dxfeng 946354b32d BUG修复 3 years ago
dxfeng 4117a34928 BUG修复 3 years ago
dxfeng b9d06b4246 分权功能版本回退,岗位BUG修复 3 years ago
dxfeng fab4614cd5 分权功能重构,调用EC方法 3 years ago
dxfeng ce2c34cfdd BUG修复,岗位关联关系调整 3 years ago
dxfeng 6169b007ae Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 3 years ago
Mlin 1bdc7e2fa4 Merge remote-tracking branch 'origin/develop' into feature/ml 3 years ago
Mlin 13ae136872 部门版本控制写入逻辑 3 years ago
dxfeng 45a24cb0be BUG修复,岗位关联关系调整 3 years ago
dxfeng 06c9912d21 BUG修复,岗位关联关系调整 3 years ago
dxfeng dee6bb25b5 岗位关联关系调整 3 years ago
dxfeng 3470ba04cd 岗位关联关系调整 3 years ago
Mlin 73dbaf75ac 分部版本控制写入逻辑 3 years ago