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

1025 Commits

Author SHA1 Message Date
dxfeng 9f991859d6 多语言支持 2024-06-04 10:51:47 +08:00
dxfeng f791642364 多语言支持 2024-06-04 10:27:44 +08:00
dxfeng dd19927376 多语言支持 2024-06-03 15:43:47 +08:00
dxfeng 0901dc28e2 多语言支持 2024-06-03 14:03:38 +08:00
dxfeng c9b41c98e6 多语言支持 2024-05-31 17:02:16 +08:00
dxfeng f51fd4713e 多语言支持 2024-05-31 11:34:09 +08:00
dxfeng 703de629f9 多语言支持 2024-05-31 09:06:51 +08:00
Chengliang 9b3f41df4d 部门合并增加记录 人员工作记录历史表 2024-05-29 18:02:28 +08:00
Chengliang 5673b44929 部门合并增加记录 人员工作记录历史表 2024-05-29 16:07:28 +08:00
Chengliang a805450cf3 去除花名册列表多余操作 2024-05-20 10:15:20 +08:00
Chengliang 5da821d653 组织架构图部门详细列表接口修改 （1.增加人员点击信息跳转，2.修复数据加载效率问题导致图展示不全；3.解除默认不展示岗位功能） 2024-05-08 16:34:03 +08:00
Chengliang fcb53a4ff0 非标功能完善 2024-05-07 17:52:56 +08:00
Chengliang 56d1bbc49e 岗位序列导入功能修复 2024-03-12 17:49:28 +08:00
Chengliang ace84c3d09 岗位序列导入功能 2024-03-12 15:26:50 +08:00
dxfeng a351557e5d 组织架构图分权BUG修复 2024-02-20 14:13:40 +08:00
dxfeng 71c490cc98 组织架构图，在编数、在岗数显示BUG修复 2024-01-09 09:07:52 +08:00
Chengliang 381033ddcb 切换维度 treeselect修复 2023-12-19 14:48:14 +08:00
dxfeng 263af54990 分部、部门导入，自定义下拉框字段转换BUG修复 2023-12-15 18:06:32 +08:00
dxfeng 025ee6283a 组织树BUG修复 2023-12-14 09:33:19 +08:00
Chengliang 06b0d09f92 1.花名册定制列table字段顺序调整无效修复 
2.组织架构图 数据统计展示 追溯部分展示数据错误修复
3.组织架构图及编制管理中在职人数统计增加主次账号判断
 2023-11-27 17:51:07 +08:00
Chengliang 4f446b20d0 历史编制 在职人数显示sql更改 2023-11-24 10:01:58 +08:00
Chengliang b4aa07b797 组织架构图一级分部分权条件修复 2023-11-16 09:46:29 +08:00
liang.cheng ab5e011640 Merge pull request '组织架构图一级分部分权' (#224) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/224
 2023-11-15 17:07:38 +08:00
Chengliang 7da6fd7997 组织架构图一级分部分权 2023-11-15 17:06:07 +08:00
dxfeng 83ef5962b1 排序BUG修复 2023-10-25 15:43:27 +08:00
dxfeng d2aa83f7f0 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-10-25 15:39:27 +08:00
dxfeng 1e3cacdc6e 排序BUG修复 2023-10-25 15:39:09 +08:00
liang.cheng 5768681170 Merge pull request 'feature/cl' (#223) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/223
 2023-10-25 14:11:41 +08:00
Chengliang 481b7dbae9 test 2023-10-25 14:08:55 +08:00
dxfeng 35cf5dc8f6 排序BUG修复 2023-10-19 11:01:00 +08:00
dxfeng 4bba5f2b9e 花名册BUG修复 2023-09-27 16:59:23 +08:00
Chengliang 7fcee07495 部门管理全部导出 2023-09-22 16:30:29 +08:00
dxfeng ad60b22c37 组织架构图BUG修复 2023-09-21 18:16:23 +08:00
dxfeng dadef74b33 岗位管理删除BUG修复 2023-09-21 15:29:30 +08:00
Chengliang 4b6c4d5c3d ”测试“ 2023-09-21 15:15:18 +08:00
dxfeng 5fad9088ca 组织架构图BUG修复 2023-09-21 14:37:14 +08:00
liang.cheng d0925f3d1f Merge pull request '组织架构图改造' (#220) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/220
 2023-09-15 10:31:41 +08:00
Chengliang 1e2bacf630 组织架构图改造 2023-09-15 10:28:37 +08:00
Mlin 9c4283a5d4 组织架构图：其他维护显示bug修复 2023-09-15 09:45:31 +08:00
liang.cheng 9c4e721033 Merge pull request '组织架构图' (#219) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/219
 2023-09-14 16:24:31 +08:00
Chengliang e6ded7373c 组织架构图 2023-09-14 16:22:56 +08:00
Mlin e44f87e3f9 组织架构图：在编数bug优化 2023-09-14 16:20:08 +08:00
Mlin 9f41a40d6e 组织架构图：在编数bug优化 2023-09-14 13:39:39 +08:00
Chengliang f78ba6f6b3 组织架构图 2023-09-14 11:05:39 +08:00
liang.cheng ef71054c94 Merge pull request '组织架构图改造' (#217) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/217
 2023-09-13 18:07:35 +08:00
Chengliang 33c3b0ccaf 组织架构图改造 2023-09-13 18:04:09 +08:00
Mlin 9e11f30ac2 Merge remote-tracking branch 'origin/feature/ml' into develop 2023-09-13 13:35:18 +08:00
Mlin 57b6542a34 组织架构图：在编数 2023-09-13 13:31:44 +08:00
liang.cheng e57af84b06 Merge pull request '组织架构图人数统计' (#216) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/216
 2023-09-12 11:23:11 +08:00
Chengliang 3c43bfa465 组织架构图人数统计 2023-09-12 11:20:20 +08:00
Mlin 29bfc3002e 存为版本：在岗数、在编数 2023-09-12 10:24:44 +08:00
Mlin 4cbb658019 Merge remote-tracking branch 'origin/develop' into feature/ml 
# Conflicts:
#	src/com/engine/organization/service/impl/ChartServiceImpl.java
#	src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
 2023-09-11 17:09:27 +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
liang.cheng 9ac1ca9852 Merge pull request '测试' (#214) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/214
 2023-09-07 17:08:53 +08:00
Chengliang 88d53422e1 测试 2023-09-07 17:01:15 +08:00
dxfeng 27d07db87e 编制信息在编数递归统计 2023-09-07 16:50:42 +08:00
liang.cheng 442c4fe200 Merge pull request '测试' (#213) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/213
 2023-09-07 16:09:44 +08:00
Chengliang 7dc5ee4fe9 测试 2023-09-07 16:08:34 +08:00
liang.cheng 4387020b06 Merge pull request '测试编制' (#212) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/212
 2023-09-07 15:30:57 +08:00
Chengliang d90906cb2e 测试编制 2023-09-07 15:28:30 +08:00
liang.cheng 89cd9761f5 Merge pull request '测试' (#211) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/211
 2023-09-07 10:45:21 +08:00
Chengliang 21cd02c72a 测试 2023-09-07 10:43:56 +08:00
dxfeng 19b844ed89 编制信息导入重复校验 2023-09-06 17:24:32 +08:00
dxfeng 640892bcb2 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-09-06 17:19:58 +08:00
dxfeng 7c8f209268 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-09-06 17:18:38 +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 498da847b3 编制模块修改 2023-09-01 17:13:41 +08:00
dxfeng e8bcb4af99 花名册台账字段展示BUG修复 2023-09-01 17:13:41 +08:00
dxfeng 8155466a96 分权管理BUG修复 2023-09-01 17:13:41 +08:00
liang.cheng a0f703099e Merge pull request 'feature/cl' (#208) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/208
 2023-09-01 17:12:19 +08:00
dxfeng b3982dff2e 花名册台账字段展示BUG修复 2023-08-30 11:29:59 +08:00
dxfeng a288ebd311 花名册台账字段展示BUG修复 2023-08-30 09:59:42 +08:00
Chengliang 51dc953766 企通学配置 2023-08-22 18:07:08 +08:00
Chengliang a94cdc7e37 企通学配置自定义 2023-08-21 18:11:50 +08:00
liang.cheng d9ca391a6e Merge pull request '企通学单点' (#207) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/207
 2023-08-18 17:40:51 +08:00
Chengliang bb68a3bc7a 企通学单点 2023-08-18 17:33:16 +08:00
dxfeng cf7ac82356 分权管理BUG修复 2023-08-18 15:15:32 +08:00
dxfeng 058aa353e5 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-08-17 17:19:52 +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 7e8a9f2556 职级、岗位序列分权 2023-08-17 17:10:37 +08:00
dxfeng 79b395fc37 等级方案、职等分权 2023-08-17 16:53:26 +08:00
dxfeng acccc9537c 分权新增、更新功能重构 2023-08-17 16:40:27 +08:00
dxfeng 2bcc0ae131 组织架构图显示部门 2023-08-17 14:21:43 +08:00
dxfeng ec7bd987b2 人员快捷搜索BUG修复 2023-08-16 17:18:43 +08:00
dxfeng a3380ce0bd 人员快捷搜索BUG修复 2023-08-16 16:40:11 +08:00
Chengliang 8c2a9937f9 修复日期 2023-08-16 15:59:25 +08:00
Chengliang 01dc480720 测试 2023-08-16 13:49:10 +08:00
dxfeng 0898759845 人员快捷搜索BUG修复 2023-08-15 18:10:05 +08:00
dxfeng 6bc5db7912 人员快捷搜索 2023-08-15 17:30:20 +08:00
dxfeng 3ff6712b27 快捷搜索条件表单 2023-08-15 15:38:28 +08:00
dxfeng 16cb2c844d 快捷搜索条件表单 2023-08-15 15:30:27 +08:00
dxfeng 5a71b861fd 快捷搜索条件表单 2023-08-15 14:09:58 +08:00
dxfeng a56b888a74 快捷搜索条件表单 2023-08-15 11:11:39 +08:00
dxfeng 4438f3937a 快捷搜索条件表单 2023-08-15 09:07:41 +08:00
dxfeng 17b9c57649 组织架构图排序 2023-08-14 15:22:21 +08:00