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
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
dxfeng 939c6c3f51 快捷搜索自定义接口BUG修复 2023-08-11 15:44:58 +08:00
dxfeng dc0c823caf 快捷搜索自定义接口BUG修复 2023-08-11 09:47:33 +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
Mlin 1fb50a8ce9 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-08-09 16:55:27 +08:00
dxfeng dacd9b180e 快捷搜索基本代码提交 2023-08-09 09:39:37 +08:00
dxfeng 8a3885db76 人员动态列导出 2023-08-07 17:38:01 +08:00
Mlin 4afe2615ec 代码优化 2023-08-07 14:38:39 +08:00
Mlin e0187b7337 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-08-04 10:08:58 +08:00
Mlin 2a6d6dfd16 拖拽逻辑代码优化 2023-08-04 10:08:48 +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
Mlin af4a2c87ef 拖拽逻辑代码优化 2023-08-02 17:26:16 +08:00
Mlin 3619fe5ac3 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-08-02 15:05:23 +08:00
Mlin 6247129bcf 拖拽优化 2023-08-02 15:04:01 +08:00
dxfeng 82d6cc74db 组织调整树BUG修复 2023-08-02 14:53:53 +08:00
Mlin 8b894bbaa3 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-08-02 11:30:09 +08:00
Mlin 3bb8c35fb5 部门拖拽优化0802 2023-08-02 11:29:56 +08:00
dxfeng d068aa6bc1 组织管理，树结构展开功能完善、分部删除BUG修复 2023-08-02 11:29:19 +08:00
Mlin 1ac72f3519 部门拖拽优化0802 2023-08-02 10:51:59 +08:00
Mlin 33dda680df 部门拖拽优化 2023-08-02 10:03:46 +08:00
Mlin 123f7eaea6 部门拖拽优化 2023-08-01 16:05:22 +08:00
Mlin 72d2867244 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-08-01 15:18:19 +08:00
Mlin 2fdd604872 部门拖拽:分部优化 2023-08-01 15:17:59 +08:00
dxfeng 647f692920 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-08-01 14:05:41 +08:00
dxfeng 04826fcaa4 组织管理，树结构展开功能完善 2023-08-01 14:05:17 +08:00
Mlin 63491e9906 部门拖拽转移优化 2023-08-01 11:20:28 +08:00
Mlin 315a67173d Merge remote-tracking branch 'origin/develop' into feature/ml 2023-08-01 09:41:55 +08:00
Mlin 32029788c4 部门拖拽转移 2023-08-01 09:41:43 +08:00
dxfeng 9a6f0a845e 组织管理，架构图树排序、BUG修复 2023-07-31 17:45:42 +08:00
dxfeng ea4a3201aa 组织管理，架构图部门树选择数据接口 2023-07-31 10:55:20 +08:00
dxfeng e011880672 组织管理，树结构禁用非部门节点 2023-07-31 10:02:38 +08:00
Mlin 50ee698cc2 Merge remote-tracking branch 'origin/develop' into feature/ml 2023-07-31 09:44:19 +08:00
Mlin 1a307f9923 部门合并，名称占用释放 2023-07-31 09:43:23 +08:00
dxfeng 59d4fac4e2 组织管理，部门封存传参，树结构优化 2023-07-31 09:29:10 +08:00
dxfeng 29bfcdc418 组织管理，分部封存传参 2023-07-28 11:33:14 +08:00
dxfeng 3fa679b139 组织管理，树结构兼容是否封存 2023-07-27 17:45:02 +08:00
dxfeng 1280b3c6b9 组织管理，TreeSelect组件全量接口开发 2023-07-27 14:32:07 +08:00
dxfeng b1b24fc925 组织管理，移动树接口提交 2023-07-26 11:23:15 +08:00
dxfeng 9610361733 组织管理，移动树接口提交 2023-07-26 10:52:10 +08:00
dxfeng 87372be17f 组织管理，编制导入BUG修复 2023-07-25 16:46:08 +08:00
dxfeng 46ecec4b17 组织管理，岗位台账、岗位浏览按钮列表展示优化 2023-07-25 09:56:32 +08:00
dxfeng fab01583ad 组织架构图，部门选择树 2023-07-24 16:38:17 +08:00
dxfeng f4c29de76b 新建编制信息初始化在编数 2023-07-24 10:32:10 +08:00
Mlin 2ee38ccc0c 版本管理代码优化 2023-07-17 14:30:44 +08:00
Chengliang d9e2a695cf 排序 时间轴 2023-07-14 15:04:11 +08:00
Mlin 775405741a 版本管理，事务控制bug优化 2023-07-14 15:00:49 +08:00
Mlin 0a809a29c9 版本管理，事务控制bug优化 2023-07-14 14:46:05 +08:00
Mlin 1abbc7cddf 版本记录，未新增分部类型、部门类型字段时同步bug修复 2023-07-14 11:40:04 +08:00
Mlin 7417cbac79 虚拟维度表查询bug修复 2023-07-14 10:51:30 +08:00
Mlin 8ac0f45d29 版本记录，虚拟人员bug修复 2023-07-13 18:05:17 +08:00
Mlin 3d7b5927b3 版本记录，虚拟人员bug修复 2023-07-13 17:51:16 +08:00
Mlin 45b663217f 版本记录，分部bug修复 2023-07-13 17:16:22 +08:00
Mlin 7d1b7b8795 版本记录，虚拟人员bug修复 2023-07-13 16:58:22 +08:00
dxfeng 696f66ec98 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-07-13 15:26:24 +08:00
dxfeng d510f32bc5 组织架构图，BUG修复 2023-07-13 15:26:11 +08:00
Chengliang f5275c2148 v3 2023-07-13 15:08:24 +08:00
Mlin 725d64888c 组织管理版本记录int类型bug修复 2023-07-13 11:08:22 +08:00
Mlin 971b997dff Merge remote-tracking branch 'origin/develop' into feature/ml 
# Conflicts:
#	src/com/engine/organization/service/impl/ChartServiceImpl.java
 2023-07-12 18:04:23 +08:00
Mlin 10a9a350b4 组织管理版本记录数据同步 2023-07-12 18:00:47 +08:00
dxfeng 62b25d6a65 组织架构图，回溯详细信息 2023-07-12 17:00:01 +08:00
dxfeng c61a071746 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-07-12 16:13:21 +08:00
dxfeng 3bf299afa4 组织架构图，回溯详细信息 2023-07-12 16:13:08 +08:00
Chengliang 81f7ecfec9 列表 2023-07-12 16:09:04 +08:00
dxfeng 151e77e69b 组织架构图，回溯详细信息 2023-07-12 11:15:11 +08:00
dxfeng 104d94ba6f 组织架构图，回溯数据查询 2023-07-12 10:17:06 +08:00
dxfeng 775cf4a8ae Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-07-12 10:16:51 +08:00
Mlin 6befb0de03 Merge remote-tracking branch 'origin/develop' into feature/ml 
# Conflicts:
#	src/com/engine/organization/service/ChartService.java
#	src/com/engine/organization/service/impl/ChartServiceImpl.java
 2023-07-11 18:12:24 +08:00
Mlin 38f3e457ef 组织管理版本记录0711 2023-07-11 18:08:40 +08:00
Chengliang 1a188a1975 v3 2023-07-11 18:04:08 +08:00
dxfeng d4a6fb4a28 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-07-11 16:12:02 +08:00
dxfeng 075456caa9 组织架构图，<根结点>添加回溯联动 2023-07-11 16:11:49 +08:00
Chengliang 54abf562a4 v3 2023-07-11 16:06:23 +08:00
liang.cheng 914649a35b Merge pull request 'v3' (#185) from feature/cl into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/185
 2023-07-11 15:25:59 +08:00
Chengliang 688eeb125c v3 2023-07-11 15:17:56 +08:00
dxfeng c023822ca5 组织架构图，兼容PG数据库 2023-07-11 11:19:19 +08:00
dxfeng a18e7a3dc7 组织架构图，添加部门层级条件 2023-07-07 14:54:21 +08:00
dxfeng eb28328219 组织架构图，岗位调整为查询聚才林岗位 2023-07-07 10:19:59 +08:00
dxfeng d9ea8fe266 修复并发情况下，岗位数据重复问题 2023-07-06 17:03:31 +08:00
dxfeng d2e1cacfa1 组织架构图，人员列表添加key 2023-07-06 14:10:39 +08:00
dxfeng 7809f9ad3c 组织架构图，人员头像 2023-07-06 13:55:48 +08:00
dxfeng 436decbc85 组织架构图，人员列表显示转换调整 2023-07-06 13:30:39 +08:00
dxfeng 38656dde58 组织架构图，部门负责人、主次账号 2023-07-06 10:47:34 +08:00
dxfeng 79f64f7f93 组织架构图，列表字段转换、卡片在岗数统计 2023-07-06 10:06:38 +08:00
dxfeng 49036ba704 组织架构图，人员卡片 2023-07-05 18:13:43 +08:00
dxfeng 603f7f606a 组织架构图，人员卡片 2023-07-05 17:54:58 +08:00
dxfeng 5559a4322a Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-07-05 17:41:47 +08:00
dxfeng e760eae9a0 组织架构图，人员卡片 2023-07-05 17:41:30 +08:00
Chengliang 9ffd5c3cfb 组织架构图 2023-07-05 17:36:04 +08:00
Chengliang 2e58769c8b 组织架构图 2023-07-05 09:16:17 +08:00
dxfeng a2247ddb12 TODO注释清理 2023-07-03 10:50:07 +08:00
dxfeng c115308f9e 组织架构图重构-异步数据接口 2023-07-03 10:49:48 +08:00
dxfeng 78c4aa5127 组织架构图重构-BUG修复 2023-06-30 17:12:58 +08:00
dxfeng c993cafab4 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2023-06-30 16:45:19 +08:00
dxfeng 4e919dea65 组织架构图重构 2023-06-30 16:44:56 +08:00
Chengliang b963913d62 架构图 2023-06-29 17:37:05 +08:00
Chengliang 2667ab8a60 修复条件 2023-06-28 17:58:12 +08:00
Chengliang 53a295a468 虚拟组织暂存 2023-06-27 16:58:45 +08:00
dxfeng 98b85ac75f 组织树添加key字段 2023-06-27 10:24:51 +08:00