Commit Graph

855 Commits (315a67173d8f4220a8d033228c6e76b07c9255cd)

Author SHA1 Message Date
dxfeng eb28328219 组织架构图,岗位调整为查询聚才林岗位 2 years ago
dxfeng d9ea8fe266 修复并发情况下,岗位数据重复问题 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
dxfeng 49036ba704 组织架构图,人员卡片 2 years ago
dxfeng 603f7f606a 组织架构图,人员卡片 2 years ago
dxfeng 5559a4322a Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng e760eae9a0 组织架构图,人员卡片 2 years ago
Chengliang 9ffd5c3cfb 组织架构图 2 years ago
Chengliang 2e58769c8b 组织架构图 2 years ago
dxfeng a2247ddb12 TODO注释清理 2 years ago
dxfeng c115308f9e 组织架构图重构-异步数据接口 2 years ago
dxfeng 78c4aa5127 组织架构图重构-BUG修复 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 2667ab8a60 修复条件 2 years ago
Chengliang 53a295a468 虚拟组织暂存 2 years ago
dxfeng 98b85ac75f 组织树添加key字段 2 years ago
Chengliang c696835a33 搜索条件修改 2 years ago
dxfeng e8d6f2ea73 组织架构图搜索条件优化 2 years ago
dxfeng 0148d99314 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
Chengliang 35d7a045e2 组织架构图V3 2 years ago
dxfeng 13c39d5fd0 Resin编译 异常、警告处理 2 years ago
dxfeng a1dd6126b0 岗位新增BUG修复 2 years ago
dxfeng cdd2e6384e 人员批量导入 BUG修复 2 years ago
dxfeng 7889b866ab Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng 2ec00b7bb3 聚才林岗位新增功能 2 years ago
Mlin f04216a113 Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
Mlin 6cea2706df 人员简历表格动态生成 2 years ago
dxfeng 3a8aa2449a 兼容PostgreSQL,简历按钮BUG修复 2 years ago
dxfeng e138489c34 兼容PostgreSQL 2 years ago
dxfeng db990ce227 兼容PostgreSQL 2 years ago
dxfeng 0ca51f58ae 花名册列表按钮权限优化 2 years ago
Mlin 472cc4ab9a 人大金仓版本bug处理 2 years ago
dxfeng f8b60493f8 花名册人员状态查询功能优化 2 years ago
dxfeng f5f5c26133 人员身份证号码导入BUG修复 2 years ago
dxfeng 2d63ca20a7 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng cb41ff1f8c 岗位浏览按钮SQL完善 2 years ago
Mlin 41fdd36997 透视图在岗数bug修复 2 years ago
dxfeng 453d4afe97 花名册查询、导出BUG修复 2 years ago
dxfeng 4113df1708 简历树,聚才林岗位搜索BUG修复 2 years ago
dxfeng eaca9535d5 分部、部门导入BUG修复 2 years ago
dxfeng 559ea407ab 岗位分权,部门列表BUG修复 2 years ago
dxfeng 6ac651e8bd 花名册,状态查询功能完善 2 years ago
dxfeng ec7ff05616 列定制BUG修复 2 years ago
dxfeng 37ded0a19b 列定制BUG修复 2 years ago
dxfeng 8947e6da3a 列定制BUG修复 2 years ago
dxfeng 5e40c18df1 列定制BUG修复 2 years ago
Mlin 4b4754bd74 Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
Mlin 2b5acfeb32 花名册模板管理bug修复 2 years ago
dxfeng 7dc6225356 Merge pull request 'BUG修复' (#145) from feature/dxf into develop
Reviewed-on: #145
2 years ago
dxfeng ba2909bac9 BUG修复 2 years ago
Mlin 8ff8340d81 Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
Mlin 9d36b42da6 花名册模板管理日期优化 2 years ago
dxfeng 0aac4a0c57 BUG修复 2 years ago
dxfeng ec55baf5fe BUG修复 2 years ago
dxfeng 6d8aaf063b BUG修复 2 years ago
Mlin 547264d755 花名册模板列定制优化20230113 2 years ago
Mlin 78682a47c7 花名册模板列定制优化20230113 2 years ago
Mlin 58d5bccddc 花名册模板列定制列名称获取优化20230113 2 years ago
Mlin 07a82baf9c Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
Mlin 5c44a11ff3 花名册模板列定制功能优化20230113 2 years ago
dxfeng 1bb7b67133 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng 1c9dce7c0b BUG修复 2 years ago
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
2 years ago
Mlin e3a78a05c7 花名册模板列定制20230113 2 years ago
dxfeng ebb4e88d0d BUG修复 2 years ago
dxfeng f79ad8681f BUG修复 2 years ago
dxfeng 563070a539 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng 15b14cf4b1 显示定制列穿梭框接口开发 2 years ago
Mlin a395024010 Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
Mlin a677da06a6 花名册模板管理查询、编辑保存20230112 2 years ago
dxfeng cb814ef077 显示定制列穿梭框接口开发 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
Mlin 12bcd367c7 Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago
dxfeng 6e1f70ef82 花名册高级搜索BUG修复 2 years ago
dxfeng 1d053a0437 花名册高级搜索BUG修复 2 years ago
dxfeng 832fb2b9c4 花名册高级搜索BUG修复 2 years ago
dxfeng f7ce6b028a 花名册高级搜索BUG修复 2 years ago
dxfeng 9dbce1e8c5 花名册高级搜索BUG修复 2 years ago
dxfeng 4ba6d5c21e 花名册高级搜索BUG修复 2 years ago
dxfeng 9e6cc7da2a Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2 years ago
dxfeng cfe08ddf4c 花名册动态查询SQL 2 years ago
Chengliang 07786bc2a6 花名册增加按钮 2 years ago
dxfeng 01c042ebbc 高级搜索表单完善 2 years ago
dxfeng 503697dd55 花名册高级搜索相关接口 2 years ago
Mlin 1c3b1296b5 Merge remote-tracking branch 'origin/develop' into feature/ml 2 years ago