Commit Graph

382 Commits

Author SHA1 Message Date
Chengliang ace84c3d09 岗位序列导入功能 2024-03-12 15:26:50 +08:00
dxfeng 025ee6283a 组织树BUG修复 2023-12-14 09:33:19 +08:00
dxfeng 35cf5dc8f6 排序BUG修复 2023-10-19 11:01:00 +08:00
dxfeng dadef74b33 岗位管理删除BUG修复 2023-09-21 15:29:30 +08:00
dxfeng 886717334b 编制方案新增,兼容PG 2023-09-11 15:47:02 +08:00
dxfeng 8b617f8423 编制方案新增,兼容Oracle 2023-09-08 17:57:49 +08:00
Chengliang b7d7912fff 编制模块 2023-09-08 10:53:46 +08:00
Chengliang 88d53422e1 测试 2023-09-07 17:01:15 +08:00
Chengliang 7dc5ee4fe9 测试 2023-09-07 16:08:34 +08:00
Chengliang d90906cb2e 测试编制 2023-09-07 15:28:30 +08:00
Chengliang 21cd02c72a 测试 2023-09-07 10:43:56 +08:00
Chengliang 7cb3b019a8 编制模块 2023-09-06 17:17:10 +08:00
Chengliang eee636230d 编制模块 2023-09-06 09:55:43 +08:00
Chengliang d8d69381ea 编制模块 2023-09-04 17:52:02 +08:00
Chengliang 51dc953766 企通学配置 2023-08-22 18:07:08 +08:00
Chengliang bb68a3bc7a 企通学单点 2023-08-18 17:33:16 +08:00
liang.cheng e4c1f4dba6 Merge pull request '11' (#205) from feature/cl into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/205
2023-08-17 17:19:07 +08:00
Chengliang b1d506cf15 11 2023-08-17 17:17:59 +08:00
dxfeng 79b395fc37 等级方案、职等分权 2023-08-17 16:53:26 +08:00
dxfeng a3380ce0bd 人员快捷搜索BUG修复 2023-08-16 16:40:11 +08:00
dxfeng 6bc5db7912 人员快捷搜索 2023-08-15 17:30:20 +08:00
dxfeng 4438f3937a 快捷搜索条件表单 2023-08-15 09:07:41 +08:00
dxfeng 939c6c3f51 快捷搜索自定义接口BUG修复 2023-08-11 15:44:58 +08:00
dxfeng 55a22e8038 快捷搜索自定义接口BUG修复 2023-08-10 11:34:08 +08:00
dxfeng 53e96cafe5 recordSet调整成MyBatis 2023-08-09 17:12:50 +08:00
dxfeng dacd9b180e 快捷搜索基本代码提交 2023-08-09 09:39:37 +08:00
dxfeng 853bf4b006 组织架构树、部门台账优化;岗位同步逻辑重写 2023-08-04 10:07:36 +08:00
dxfeng 49e9e33624 岗位台账展示信息优化 2023-08-02 17:42:45 +08:00
dxfeng a065c7369d 岗位台账展示信息优化 2023-08-02 17:39:15 +08:00
dxfeng 46ecec4b17 组织管理,岗位台账、岗位浏览按钮列表展示优化 2023-07-25 09:56:32 +08:00
Mlin 38f3e457ef 组织管理版本记录0711 2023-07-11 18:08:40 +08:00
dxfeng 7809f9ad3c 组织架构图,人员头像 2023-07-06 13:55:48 +08:00
dxfeng 436decbc85 组织架构图,人员列表显示转换调整 2023-07-06 13:30:39 +08:00
dxfeng 79f64f7f93 组织架构图,列表字段转换、卡片在岗数统计 2023-07-06 10:06:38 +08:00
Chengliang 2e58769c8b 组织架构图 2023-07-05 09:16:17 +08:00
dxfeng 13c39d5fd0 Resin编译 异常、警告处理 2023-06-21 11:42:21 +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
Mlin 472cc4ab9a 人大金仓版本bug处理 2023-03-24 14:24:55 +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 ec7ff05616 列定制BUG修复 2023-01-17 14:52:45 +08:00
dxfeng 5e40c18df1 列定制BUG修复 2023-01-16 15:08:22 +08:00
Mlin 58d5bccddc 花名册模板列定制列名称获取优化20230113 2023-01-13 14:07:33 +08:00
Mlin 5c44a11ff3 花名册模板列定制功能优化20230113 2023-01-13 13:44:05 +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