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

522 Commits

Author SHA1 Message Date
dxfeng a36648ea39 花名册树BUG 2022-10-25 11:09:14 +08:00
‘ml’ f2c5d1227b 分部、部门、岗位禁用、合并修复1025 2022-10-25 10:47:08 +08:00
‘ml’ e198209705 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-10-25 09:03:16 +08:00
dxfeng 594173175c 更新人员Map表信息 2022-10-25 08:59:24 +08:00
dxfeng b446dbdb53 人员导入、花名册左侧树BUG修复 2022-10-24 19:06:07 +08:00
‘ml’ f30998351f Merge remote-tracking branch 'origin/develop' into feature/ml 
# Conflicts:
#	src/com/engine/organization/thread/CompanyTriggerRunnable.java
#	src/com/engine/organization/thread/DepartmentTriggerRunnable.java
 2022-10-24 16:01:51 +08:00
‘ml’ 65ccecce56 分部、部门、岗位禁用修复1024 2022-10-24 16:00:00 +08:00
dxfeng dca18ea5b1 编制导入模板、人员卡片、组织架构图Oracle 2022-10-24 15:57:08 +08:00
dxfeng 3b4c59ae8c 人员相关BUG修复 2022-10-21 17:44:53 +08:00
dxfeng 2515121d83 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-10-21 15:58:13 +08:00
dxfeng 11a4a85ff1 人员关联调整 2022-10-21 15:57:55 +08:00
‘ml’ 05fe14b5e1 分部转移、部门转移、岗位合并修复1021 2022-10-21 15:53:15 +08:00
‘ml’ 887a1eafe3 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-10-21 09:47:27 +08:00
dxfeng 52c8b86adb 人员关联调整 2022-10-21 09:28:33 +08:00
‘ml’ 9a9b79cff0 Merge remote-tracking branch 'origin/develop' into feature/ml 2022-10-20 17:31:23 +08:00
‘ml’ a0660a7857 分部转移、部门转移、岗位合并修复1020 2022-10-20 17:30:34 +08:00
dxfeng b7e34c1d31 人员关联调整 2022-10-20 09:07:32 +08:00
dxfeng a5687b3995 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-10-19 15:42:01 +08:00
‘ml’ adc92c8287 部门合并在岗数优化1019 2022-10-19 15:38:47 +08:00
dxfeng eb007f5b23 人事卡片BUG修复 2022-10-18 16:35:08 +08:00
‘ml’ 5005243758 部门合并在岗数优化 2022-10-18 12:17:11 +08:00
dxfeng 414aefe41c 人事卡片BUG修复 2022-10-18 11:41:11 +08:00
dxfeng 63b6b88a96 人员管理BUG修复 2022-10-17 17:16:26 +08:00
dxfeng 396a4570d0 BUG修复 2022-10-17 11:35:46 +08:00
dxfeng cd4d2c77bf 人员卡片BUG修复 2022-10-17 09:36:08 +08:00
dxfeng f36756e1fd 分部、岗位 禁用功能限制 2022-10-14 14:56:35 +08:00
dxfeng 4a85fc46aa 部门转移BUG修复 2022-10-14 11:33:24 +08:00
dxfeng 1d7389c872 人员卡片 2022-10-14 11:06:15 +08:00
dxfeng f9c33da655 人员管理完善 2022-10-14 09:13:28 +08:00
dxfeng 46068ab008 编制Action 添加提示信息，BUG修复 2022-10-13 13:59:41 +08:00
dxfeng c538a6205f Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-10-12 15:28:32 +08:00
dxfeng 3ac7c2b959 聚才林花名册 2022-10-12 15:28:11 +08:00
dxfeng f26159506a 岗位浏览按钮、编制action BUG修复 2022-10-12 15:23:24 +08:00
‘ml’ c78f2157f8 层级显示不一致优化 2022-10-10 18:24:07 +08:00
Chengliang eb5578fd64 编制删除 2022-10-10 17:35:48 +08:00
dxfeng 9df3349715 兼容EC岗位名称重复 2022-10-09 15:36:53 +08:00
dxfeng 231addfda1 人事卡片接口开发 2022-10-09 11:42:26 +08:00
dxfeng 284f778963 人员调整,在岗数关联优化 2022-09-30 15:19:22 +08:00
dxfeng acee0bad51 人员调整,在岗数关联优化 2022-09-30 11:05:42 +08:00
dxfeng c6fb0d129b 组织架构图编制、在岗,数据优化 2022-09-29 15:57:00 +08:00
Chengliang ca3a093357 bug 2022-09-29 10:28:04 +08:00
dxfeng 02836ce37d 岗位名称校验、编制展示优化、BUG修复 2022-09-23 15:53:37 +08:00
dxfeng 92d9a17d8c 组织架构图编制显示优化 2022-09-23 09:19:42 +08:00
dxfeng 106d7e8bb8 更新人员、编制 同步组织架构图 2022-09-21 16:23:09 +08:00
dxfeng 7eb7a93397 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-09-21 10:45:26 +08:00
dxfeng a847a4efef 兼容Oracle,达梦 2022-09-21 10:43:41 +08:00
dxfeng 8a9370ee9e BUG修复 2022-09-20 18:46:05 +08:00
Chengliang 61aabb4ca1 测试 2022-09-20 14:24:26 +08:00
dxfeng 38725f97b0 BUG修复 2022-09-20 14:19:46 +08:00
dxfeng 2632f6c857 BUG修复 2022-09-20 10:25:13 +08:00
dxfeng b214ec8509 BUG修复 2022-09-20 09:18:24 +08:00
dxfeng fe668c37e7 BUG修复 2022-09-19 13:27:50 +08:00
dxfeng c49abcf77f BUG修复 2022-09-16 16:56:30 +08:00
dxfeng c8eb2f3451 BUG修复 2022-09-16 14:48:00 +08:00
dxfeng 1b4d7203b8 BUG修复 2022-09-16 11:28:47 +08:00
dxfeng b494a6a96e BUG修复 2022-09-16 11:01:31 +08:00
dxfeng 29295bb464 BUG修复 2022-09-16 10:22:15 +08:00
dxfeng 4b3bb0d5f3 编制导入 2022-09-15 18:40:05 +08:00
dxfeng 16fcd76468 编制导入 2022-09-15 18:31:11 +08:00
dxfeng 50e5c7312e 编制导入 2022-09-15 16:51:35 +08:00
dxfeng 8b7b75b57b Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-09-15 10:43:38 +08:00
dxfeng 35439a442f BUG 修复 2022-09-15 10:41:04 +08:00
Chengliang fbd608a52a 顶部按钮修改 2022-09-14 17:14:12 +08:00
dxfeng 76b9cd2a89 部门复制 2022-09-09 15:29:21 +08:00
dxfeng 34d44b6c91 部门复制 2022-09-09 14:41:04 +08:00
dxfeng 8e385537da BUG修复 2022-09-09 10:25:57 +08:00
dxfeng 5c66744468 部门合并、组织导入 2022-09-08 17:54:46 +08:00
dxfeng f6c41a3467 部门合并重写 2022-09-08 15:36:47 +08:00
Chengliang 6de1b0746f 修复富文本长度 2022-09-08 10:41:04 +08:00
dxfeng 0a87a2ad4d Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-09-07 19:17:10 +08:00
dxfeng 91a8ad0bd3 导入BUG 2022-09-07 19:12:47 +08:00
Chengliang c280c5f908 fixed 2022-09-07 19:12:42 +08:00
dxfeng 59f76c012c 触发器，分部、部门赋值，SQL脚本 2022-09-07 15:40:19 +08:00
dxfeng 34af4f95c9 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-09-06 17:23:57 +08:00
dxfeng 79c5f94862 导入问题处理 2022-09-06 17:23:44 +08:00
dxfeng 120b4efdba 不同等级方案、编号可重复 2022-09-06 15:38:16 +08:00
Chengliang 8553e37c22 fixed 2022-09-06 15:31:24 +08:00
Chengliang 1c900eafc9 Merge remote-tracking branch 'origin/develop' into feature/cl 
# Conflicts:
#	src/com/engine/organization/service/impl/CompServiceImpl.java
 2022-09-06 15:30:09 +08:00
dxfeng 6765fd8fc4 左侧树排序 2022-09-06 15:19:16 +08:00
Chengliang ba0b31f086 fixed 2022-09-06 14:26:09 +08:00
dxfeng 900ded1aad 表结构更新 2022-09-06 14:01:01 +08:00
dxfeng 278d61c499 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-09-06 10:51:35 +08:00
Chengliang 3e06077e2a fixed 2022-09-06 10:34:23 +08:00
dxfeng 6c04ffd384 编制管理 2022-09-06 10:33:46 +08:00
dxfeng 6415ee3eb7 编制方案 2022-09-06 09:45:56 +08:00
dxfeng d65551c0ee 复制BUG修复 2022-09-05 18:33:20 +08:00
dxfeng b1b2a9a88a 部门管理，更新为EC 2022-09-05 17:25:11 +08:00
dxfeng 4fa38f704c 分部管理，更新为EC 2022-09-05 15:58:46 +08:00
dxfeng f05cf6da8f BUG修复 2022-09-05 10:51:08 +08:00
reset 38a1fca585
!224 bug修复 
Merge pull request !224 from reset/feature/cl
 2022-09-02 09:49:26 +00:00
Chengliang 0ffb0bac33 fix 2022-09-02 17:48:14 +08:00
dxfeng 337f8e51ed Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-09-02 17:32:14 +08:00
dxfeng 989526bc26 使用状态BUG修复 2022-09-02 17:31:44 +08:00
Chengliang 819a053aa3 fixed 2022-09-02 16:17:01 +08:00
Chengliang f5fcbdaff8 列表宽度顺序调整 2022-09-02 11:23:16 +08:00
reset 385ff8331e
!220 fixed 
Merge pull request !220 from reset/feature/cl
 2022-09-01 09:05:18 +00:00
Chengliang 3eb29f823f fixed 2022-09-01 17:03:45 +08:00
dxfeng 09d624b46b
!219 触发器、非标开关 
Merge pull request !219 from dxfeng/feature/dxf
 2022-09-01 09:02:15 +00:00
dxfeng 489ad2fdd0 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-09-01 17:00:38 +08:00
dxfeng b49a25742a 触发器、非标开关 2022-09-01 16:57:06 +08:00