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

936 Commits

Author SHA1 Message Date
Chengliang 4e4cf54f8a 人员卡片权限 2022-11-01 17:53:31 +08:00
dxfeng 895528617b 分部、部门、岗位、人员 分权功能开发 2022-11-01 10:05:43 +08:00
dxfeng 955134dc28 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 
 Conflicts:
	src/com/engine/organization/service/impl/ManagerDetachServiceImpl.java
 2022-10-31 11:40:05 +08:00
dxfeng 0b3cd0641b 分权开发 2022-10-28 17:43:46 +08:00
Chengliang 1e08772a9d 分权开关设置 2022-10-28 17:41:56 +08:00
dxfeng 40f1f097e6 代码合并 2022-10-28 10:35:33 +08:00
liang.cheng 19cccb9345 Merge pull request 'feature/detach' (#29) from feature/detach into develop 
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/29
 2022-10-28 09:36:40 +08:00
dxfeng 3989161281 组织架构图相关BUG修复 2022-10-27 19:11:58 +08:00
Chengliang 47c64b6797 模块管理分权 2022-10-27 15:06:50 +08:00
Chengliang ef392f4d0a 模块管理分权 2022-10-27 15:00:12 +08:00
‘ml’ 1be79b9698 分部、部门、岗位禁用修复1024 2022-10-27 15:00:07 +08:00
‘ml’ 939e6c7607 分部转移、部门转移、岗位合并修复1021 2022-10-27 14:59:57 +08:00
Chengliang 96cefec891 模块管理分权 2022-10-27 14:58:44 +08:00
Chengliang f6ea4425cf 模块管理分权 2022-10-27 14:58:44 +08:00
Chengliang 4c74b583bf 模块管理分权 2022-10-27 14:58:44 +08:00
Chengliang 2b975e6636 模块管理分权中心接口 2022-10-27 14:58:44 +08:00
dxfeng 92b246b5d5 组织架构图相关BUG修复 2022-10-27 14:39:35 +08:00
dxfeng 679c77f732 组织架构图相关BUG修复 2022-10-26 20:12:14 +08:00
dxfeng 7258ee742d 编制模板优化 2022-10-25 16:24:18 +08:00
dxfeng b2fc9d3e0c 人员编号、岗位部门、自定义下拉框BUG修复 2022-10-25 15:43:02 +08:00
dxfeng eeb21315c7 Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf 2022-10-25 11:29:05 +08:00
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
Chengliang 80d3202c70 fixed 2022-09-01 13:49:21 +08:00
Chengliang b5b90a6403 修复组织架构图跳转问题 2022-09-01 10:16:58 +08:00
dxfeng 1f7f299368 分部、部门、岗位触发器 2022-08-31 14:24:00 +08:00
dxfeng 56ed6aa197 BUG修复 2022-08-30 10:46:42 +08:00
dxfeng 21dc07dd40 BUG修复 2022-08-29 17:07:34 +08:00
dxfeng 5dc920e364 人员信息分类 2022-08-29 15:39:35 +08:00
dxfeng cfc78875c6 人员信息分类 2022-08-29 14:26:10 +08:00
dxfeng b6caffc74f 人员信息分类 删除接口 2022-08-29 14:12:06 +08:00
dxfeng 2744f85eff BUG修复 2022-08-29 11:07:10 +08:00
dxfeng 532a6d00ce 人员信息分类 2022-08-29 09:22:45 +08:00
dxfeng 6351109b79 人员信息分类 2022-08-26 17:36:26 +08:00
dxfeng f82e679837 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-08-26 15:36:33 +08:00
dxfeng 8968e44e09 分部、部门、岗位同步EC重写 2022-08-26 15:36:06 +08:00
Chengliang 6bfc6eae27 人员信息管理 2022-08-26 15:27:51 +08:00
Chengliang ca7d34a5bd 人员信息模块 2022-08-24 17:57:04 +08:00
reset 776d60674b
!207 fixed 
Merge pull request !207 from reset/feature/cl
 2022-08-24 01:54:09 +00:00
Chengliang c8bf27880a fixed 2022-08-24 09:53:07 +08:00
Chengliang 8043012b41 人基础员信息 2022-08-23 17:51:20 +08:00
dxfeng 0d9cbe7ff5 BUG修复 2022-08-23 17:43:09 +08:00
dxfeng 07dabf46a0 BUG修复 2022-08-22 18:56:27 +08:00
dxfeng fb5eea214b BUG修复 2022-08-22 15:32:42 +08:00
dxfeng 564b30eed8 BUG修复 2022-08-22 15:04:38 +08:00
dxfeng 477a2f3bce 自定义字段BUG修复 2022-08-22 13:35:21 +08:00
dxfeng e135b02ed7
!201 BUG修复 
Merge pull request !201 from dxfeng/feature/dxf
 2022-08-22 01:10:41 +00:00
dxfeng ff8660a586 BUG修复 2022-08-22 09:10:00 +08:00
dxfeng 9c64467cc8 BUG修复 2022-08-19 10:37:05 +08:00
dxfeng b1ed914ebc BUG修复，权限控制 2022-08-19 10:28:17 +08:00
Chengliang 94ce6388e2 fixed 2022-08-18 17:41:05 +08:00
dxfeng ef6f21c636 BUG修复，权限控制 2022-08-18 15:17:59 +08:00
dxfeng 5cce107318 BUG修复，权限控制 2022-08-18 14:27:16 +08:00
dxfeng 3acec4730d BUG修复，权限控制 2022-08-17 19:29:46 +08:00
dxfeng e3207f2996 BUG修复 2022-08-17 13:34:29 +08:00
dxfeng ea64d13503 BUG修复 2022-08-17 09:28:04 +08:00
dxfeng e0b09bde52 BUG修复 2022-08-12 16:35:53 +08:00
dxfeng cdafa11668 兼容Oracle 2022-08-12 14:09:10 +08:00
dxfeng e4d9d80fee 兼容Oracle 2022-08-12 10:12:55 +08:00
dxfeng 1318fc1aba BUG修复 2022-08-12 09:34:19 +08:00
dxfeng 05c24b5e98 Oracle BUG修复 2022-08-11 15:14:54 +08:00
dxfeng 3e6a4acf8c Oracle BUG修复 2022-08-11 11:17:41 +08:00
dxfeng f27612db94 Oracle BUG修复 2022-08-11 10:43:52 +08:00
dxfeng abc470935e
!188 BUG修复 
Merge pull request !188 from dxfeng/feature/dxf
 2022-08-10 07:38:04 +00:00
dxfeng 6576335c6c BUG修复 2022-08-10 15:37:23 +08:00
reset ad5cfbb527
!187 fix 
Merge pull request !187 from reset/feature/cl
 2022-08-10 07:37:22 +00:00
Chengliang fef2717962 组织架构图查询条件 2022-08-10 15:35:43 +08:00
dxfeng 08a9ab7b0d BUG修复 2022-08-10 15:25:34 +08:00
dxfeng 48861cdace BUG修复 2022-08-08 08:55:24 +08:00
dxfeng 68ae1c03fd BUG修复 2022-08-05 15:21:56 +08:00
dxfeng 36ce009929 非标脚本完善，BUG修复 2022-08-04 10:29:29 +08:00
dxfeng 5779beacff 非标脚本完善，BUG修复 2022-08-03 18:35:42 +08:00
dxfeng 0e3fc1a238 同步CusFieldData数据接口 2022-08-02 16:25:21 +08:00
dxfeng ceb3484d6d 编制方案需求完善 2022-08-02 15:10:36 +08:00
dxfeng 1c9b1abe69 编制方案需求完善 2022-08-02 14:42:25 +08:00
dxfeng 7b88ba5a78 编制方案需求完善 2022-08-02 13:39:47 +08:00
dxfeng 6c91c3d41d BUG修复 2022-08-01 18:34:20 +08:00
dxfeng 46ab51ee18 人员导入、CusFieldData触发器调整 2022-08-01 17:03:13 +08:00
dxfeng ceba6b5d62 BUG修复 2022-08-01 09:09:39 +08:00
dxfeng 0a47b3548d 人员导入 2022-07-29 16:20:59 +08:00
dxfeng d5447c8e59 岗位导入 2022-07-27 16:47:19 +08:00
dxfeng bc151f7648 部门导入 2022-07-27 11:41:30 +08:00
dxfeng fc8aaf7729 部门导入、日志记录 2022-07-27 10:48:43 +08:00
dxfeng c23127acc2 分部导入、日志记录 2022-07-27 09:22:15 +08:00
dxfeng b1365da225 分部导入 2022-07-26 16:33:41 +08:00
dxfeng 79d79575da 分部导入 2022-07-26 10:24:59 +08:00
dxfeng 3356a7388e 分部导入 2022-07-26 10:15:01 +08:00
dxfeng 9d304b0303 分部导入 2022-07-26 09:40:13 +08:00
dxfeng 5ccb12569a
!163 BUG 修复 
Merge pull request !163 from dxfeng/feature/dxf
 2022-07-25 01:08:21 +00:00
dxfeng 56a697d4e4 BUG 修复 2022-07-22 16:02:32 +08:00
MustangDeng 3e92e25520 Merge branch 'feature/djp' into develop 2022-07-21 13:49:54 +08:00
MustangDeng d950e1ae40 fix: fleader问题 2022-07-21 13:49:06 +08:00
MustangDeng cc318fa73c Merge branch 'feature/djp' into develop 2022-07-21 11:57:29 +08:00
MustangDeng 10a577d0c4 Merge remote-tracking branch 'origin/develop' into develop 2022-07-21 11:57:18 +08:00
MustangDeng ac490e1b8f fix: whereSql合并 2022-07-21 11:56:54 +08:00
MustangDeng 06ccafb464 fix: fnumber问题 2022-07-21 11:08:08 +08:00
MustangDeng 0a1e6c6e7d feature: 组织架构异步数据v1.0 2022-07-21 11:01:36 +08:00
dxfeng 3ed9ec2f99 岗位浏览按钮优化 2022-07-18 13:33:11 +08:00
dxfeng 8869a18977 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-07-18 13:27:36 +08:00
dxfeng fa663a1eaa 岗位浏览按钮优化 2022-07-18 13:27:15 +08:00
reset 71109c35ae Merge branch 'develop' of gitee.com:jmlcl/weaver-hrm-organization into feature/cl 2022-07-18 01:42:25 +00:00
Chengliang 09490fe867 浏览按钮 2022-07-15 17:13:02 +08:00
Chengliang cb274d6a6c 需求优化2 2022-07-15 17:13:02 +08:00
dxfeng 1db3f999f9 分部更新EC 2022-07-15 17:13:02 +08:00
dxfeng 92b2f54ddd 人员拓展卡片、分部更新EC 2022-07-15 17:13:02 +08:00
dxfeng 58e9f0ebb8 初始化SQL提交 2022-07-15 16:49:54 +08:00
dxfeng 3c74268126 岗位浏览按钮 2022-07-15 14:42:31 +08:00
dxfeng b8adf9ab7b 岗位模块操作同步EC 2022-07-15 09:02:18 +08:00
dxfeng 15c9ef7e61 分部、部门 添加UUID列;部门表结构更新 2022-07-13 17:19:45 +08:00
dxfeng d72c68dec0 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-07-13 10:56:04 +08:00
dxfeng e217ecbe16 分部更新EC 2022-07-13 10:55:44 +08:00
reset 7f5568809c
!154 需求优化2 
Merge pull request !154 from reset/feature/cl
 2022-07-13 01:22:17 +00:00
Chengliang a1ed3e45c9 需求优化2 2022-07-13 09:20:21 +08:00
dxfeng b52bb93dfa 人员拓展卡片、分部更新EC 2022-07-12 16:38:27 +08:00
dxfeng 81fcd96af6 人员拓展卡片 2022-07-11 15:59:15 +08:00
dxfeng 7ecd58d27b 删除webService 2022-07-11 10:01:43 +08:00
dxfeng 15a819a272 表结构更新 2022-07-11 09:14:02 +08:00
MustangDen f4f222ba91 Merge branch 'feature/djp' into develop 2022-07-08 16:25:08 +08:00
MustangDen 7df8602e97 fix 组织架构sql问题 2022-07-08 16:24:30 +08:00
dxfeng 2bbf5367c6 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-07-08 14:08:11 +08:00
dxfeng d760367a95 记录操作日志 2022-07-08 14:07:55 +08:00
670124965@qq.com 58f3aedf9d Merge branch 'feature/djp' into develop 2022-07-08 11:38:16 +08:00
dxfeng 2175d7ca6a 记录操作日志 2022-07-07 17:30:32 +08:00
dxfeng 7103eb0c73 记录操作日志 2022-07-07 15:32:30 +08:00
dxfeng e83e3b90fc Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-07-07 14:20:18 +08:00
dxfeng 40a7c066a2 记录操作日志 2022-07-07 14:19:56 +08:00
Chengliang 0bdcc18c56 日期组合改造 2022-07-07 11:54:21 +08:00
MustangDeng b589056585 组织结构图接口 2022-07-07 10:14:25 +08:00
dxfeng 2702b175cd 记录操作日志 2022-07-06 15:43:16 +08:00
dxfeng cca52d7080 记录操作日志 2022-07-06 11:44:07 +08:00
dxfeng c139cd408a 记录操作日志 2022-07-06 10:15:26 +08:00
dxfeng 4f52218e89 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-07-05 18:47:26 +08:00
reset 9b1d7a26d3
!141 需求优化 
Merge pull request !141 from reset/feature/cl
 2022-07-05 10:46:50 +00:00
dxfeng bef63439b2 记录操作日志 2022-07-05 18:46:43 +08:00
Chengliang 6c304e8a81 需求优化 2022-07-05 18:45:40 +08:00
dxfeng 278194a4a3 记录操作日志,岗位优化 2022-07-05 18:44:45 +08:00
dxfeng f5d95fabb2 记录操作日志 2022-07-05 15:15:00 +08:00
dxfeng 618e30e6ef 操作日志 2022-07-05 09:42:09 +08:00
dxfeng 37142c3a3e Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 
 Conflicts:
	src/com/engine/organization/service/impl/DemoServiceImpl.java
 2022-07-05 09:39:51 +08:00
dxfeng 033e90aa34 操作日志 2022-07-05 09:39:00 +08:00
Chengliang 46aeddea39 需求调整 2022-07-04 17:51:31 +08:00
Chengliang eec9446dcd 去除weaverboot引用 2022-07-04 14:24:20 +08:00
dxfeng 6b96ea7ca0 人员列表 搜索条件 2022-07-04 10:01:28 +08:00
dxfeng 03f59d55d0 人员列表查询系统表 异常信息处理 2022-07-04 09:18:56 +08:00
dxfeng 5291c3b855 分部列表BUG修复 2022-07-01 17:46:25 +08:00
dxfeng 1a1646e818 人员导入 2022-07-01 15:37:25 +08:00
dxfeng fca0bb4dad 人员导入 2022-07-01 14:02:03 +08:00
dxfeng d508a4d9d0 人员导入，日志表结构 2022-06-30 16:22:57 +08:00
dxfeng 66f5438d17 人员导入 2022-06-30 14:20:59 +08:00
dxfeng 1e7caac8ff 人员导入 2022-06-30 14:09:28 +08:00
dxfeng 655933236c 组织导入 2022-06-30 13:36:55 +08:00
dxfeng 26ef362eb4 组织导入 2022-06-30 11:17:59 +08:00
dxfeng 3f6b2c340b 人员导入 2022-06-29 18:29:45 +08:00
dxfeng c8b93b70b4 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-06-29 17:07:56 +08:00
dxfeng 82aa6c5a03 人员导入 2022-06-29 17:07:41 +08:00
reset be94ae88e7
!129 1 
Merge pull request !129 from reset/feature/cl
 2022-06-29 08:59:32 +00:00
Chengliang 5445e6bfac 导出和批量导出完成 2022-06-29 16:57:45 +08:00
Chengliang 300ccd6d77 “导出修改” 2022-06-29 15:21:36 +08:00
dxfeng 9b54954ef8 人员导入 2022-06-29 14:50:11 +08:00
dxfeng 354220fac3 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-06-29 14:31:49 +08:00
Chengliang 34715a05e7 类导入 2022-06-29 14:27:52 +08:00
dxfeng 48171c7e82 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-06-29 14:21:17 +08:00
Chengliang 783b9fc6bf 人员导出 2022-06-29 14:18:47 +08:00
dxfeng 5ceb8ae068 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-06-29 14:16:39 +08:00
dxfeng c14286bf94 人员导入 2022-06-29 14:16:11 +08:00
dxfeng ff06d705e7 人员导入 2022-06-29 14:11:16 +08:00
dxfeng 2fb33877f5 人员导入 2022-06-29 09:11:45 +08:00
Chengliang 0ad6157c26 人员导出功能 2022-06-28 19:04:14 +08:00
dxfeng 4eef6f62de 人员导入 2022-06-28 10:47:11 +08:00
Chengliang 82aa37e2ed bug修复 增加导入 2022-06-27 16:26:48 +08:00
dxfeng d0ea50cec5 部门、岗位 合并 2022-06-24 18:26:15 +08:00
dxfeng db4e066294 复制分部 表结构更新 2022-06-24 16:14:13 +08:00
dxfeng ff5b1a2e1b 复制部门、岗位 2022-06-24 14:40:49 +08:00
dxfeng 2ea923f9c9 转移分部 2022-06-24 14:22:10 +08:00
dxfeng 15131186de 分部、部门、岗位列表排序 2022-06-23 18:49:47 +08:00
dxfeng 6c40245b02 组织人事测试、优化 2022-06-23 16:55:26 +08:00
dxfeng a2c768d0ab 组织人事测试、优化 2022-06-23 15:42:32 +08:00
dxfeng e4dc4704ce 组织人事测试、优化 2022-06-23 15:42:12 +08:00
dxfeng de1d4a8944 组织人事测试、优化 2022-06-23 14:29:56 +08:00
dxfeng f035662fb6 组织人事测试、优化 2022-06-23 13:43:52 +08:00
dxfeng eeb8c47451 组织人事测试、优化 2022-06-23 09:14:19 +08:00
dxfeng f72db1b5f9 组织人事测试、优化 2022-06-22 11:22:51 +08:00
dxfeng 779e03cb32 修改时，编号可以修改 2022-06-21 18:39:26 +08:00
dxfeng 9796bdc823 修改时，编号可以修改 2022-06-21 18:23:17 +08:00
dxfeng 0b78da90ce Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-06-21 17:51:17 +08:00
dxfeng bdc813000e 人员管理查询条件 按钮接口， 
是否禁用名称更改
 2022-06-21 17:50:56 +08:00
reset 9ab987c01b
!110 增加排序 
Merge pull request !110 from reset/feature/cl
 2022-06-21 09:16:17 +00:00
Chengliang d3bcc35f31 增加排序 2022-06-21 17:12:33 +08:00
dxfeng 5b6cf8fe72 人员管理新增、编辑相关接口 2022-06-21 16:47:39 +08:00
dxfeng 187be45bdf 人员管理：左侧树、列表接口 2022-06-21 13:49:37 +08:00
dxfeng fe0417618c Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-06-20 18:31:35 +08:00
dxfeng b8f866e28b 人员树接口 2022-06-20 18:31:11 +08:00
Chengliang 4cbc15affd 优化 2022-06-20 18:26:02 +08:00
dxfeng d4e93eded4 BUG修复 2022-06-20 15:43:02 +08:00
dxfeng 6474ce7128 BUG修复 2022-06-20 15:16:25 +08:00
dxfeng ad581a9c05 BUG修复 2022-06-20 15:08:18 +08:00
dxfeng abf99aaa51 BUG修复 2022-06-20 14:50:59 +08:00
Chengliang 0ddecb1d2f v1.2 2022-06-20 11:12:37 +08:00
Chengliang 95744654b7 优化 2022-06-20 09:48:17 +08:00
dxfeng 2af1fb6336 移动到组 2022-06-20 09:09:14 +08:00
dxfeng 2a57f20693 BUG 修复 2022-06-17 17:51:26 +08:00
dxfeng 6df1accb98 BUG 修复 2022-06-17 16:54:16 +08:00
dxfeng f42ee2b8d1 BUG 修复 2022-06-17 16:06:29 +08:00
dxfeng 20bafffd2f BUG 修复 2022-06-17 16:00:05 +08:00
dxfeng caff3332ce BUG 修复 2022-06-17 14:19:52 +08:00
dxfeng fdf2572654 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 
 Conflicts:
	src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml
 2022-06-17 11:51:48 +08:00
dxfeng 84adef0520 表结构更新 2022-06-17 11:48:32 +08:00
dxfeng e9aa68229d 表结构更新 2022-06-17 11:48:15 +08:00
dxfeng 445507d10d 表结构更新 2022-06-17 10:54:59 +08:00
reset bb324ad8d1
!93 新增类型修改 
Merge pull request !93 from reset/feature/cl
 2022-06-17 02:41:20 +00:00
Chengliang b60a335a1c 新增类型修改 2022-06-17 10:39:52 +08:00
dxfeng c8604a8e40 数据返回格式修改 2022-06-17 09:45:32 +08:00
dxfeng 9aebfbcecc 字段删除 移动分组 2022-06-16 18:26:12 +08:00
dxfeng 3ba19c1b8d 代码合并 2022-06-16 18:08:06 +08:00
dxfeng eb9c77b2d0 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 
 Conflicts:
	src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java
	src/com/engine/organization/web/FieldDefinedController.java
	src/com/engine/organization/wrapper/FieldDefinedWrapper.java
 2022-06-16 18:04:32 +08:00
Chengliang 6d4448ec51 子信息维护 2022-06-16 17:57:03 +08:00
dxfeng 4d2a70ad5d 自定义字段列表接口 2022-06-16 17:53:48 +08:00
dxfeng 08ca2e0c5d 自定义字段列表 2022-06-16 16:10:33 +08:00
dxfeng 52c964f199 添加自定义字段接口 2022-06-16 14:19:54 +08:00
dxfeng 57b29a2312 BUG修复 2022-06-16 09:55:07 +08:00
dxfeng e588fb0c96 BUG修复 2022-06-16 09:37:36 +08:00
dxfeng 70de6bbbd7 处理代码冲突 2022-06-15 18:12:53 +08:00
dxfeng 3f151d55e6 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 
 Conflicts:
	src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java
	src/com/engine/organization/service/FieldDefinedService.java
	src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java
	src/com/engine/organization/web/FieldDefinedController.java
	src/com/engine/organization/wrapper/FieldDefinedWrapper.java
 2022-06-15 18:09:26 +08:00
dxfeng 7c02e9bc61 分组删除 新增自定义字段 2022-06-15 18:03:01 +08:00
Chengliang 8564d29bf1 新增类型默认title 2022-06-15 17:56:29 +08:00
Chengliang f4f7038611 新增编辑类型 2022-06-15 17:17:34 +08:00
Chengliang 068c446765 solve conflict 2022-06-15 11:41:44 +08:00
Chengliang 032a363985 自定义页面树 2022-06-15 11:36:48 +08:00
dxfeng c8112bd701
!82 分组维护 新建分组 
Merge pull request !82 from dxfeng/feature/dxf
 2022-06-15 03:26:31 +00:00
dxfeng b4b54fa1e1 分组维护 新建分组 2022-06-15 11:25:23 +08:00
dxfeng 1c7b232172
!81 代码合并 
Merge pull request !81 from dxfeng/feature/dxf
 2022-06-14 10:04:22 +00:00
dxfeng d809107c48 代码合并 2022-06-14 18:03:35 +08:00
reset 07cb72c05c
!80 11 
Merge pull request !80 from reset/feature/cl
 2022-06-14 10:01:35 +00:00
Chengliang cde0608e02 自定义树页面修好 2022-06-14 18:00:51 +08:00
dxfeng 568c9411da 代码合并 2022-06-14 17:57:41 +08:00
dxfeng 079addd6c7 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 
 Conflicts:
	src/com/engine/organization/service/FieldDefinedService.java
	src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java
 2022-06-14 17:56:26 +08:00
dxfeng a7e5619097 细化分组、标题、名字表是否启用； 
明细表按照上下级关系展示。
 2022-06-14 17:53:49 +08:00
reset 6e7c76ac0d
!78 自定义设置页面树 
Merge pull request !78 from reset/feature/cl
 2022-06-14 08:11:40 +00:00
Chengliang 6b1ce95b48 自定义设置页面树 2022-06-14 16:10:26 +08:00
dxfeng 9259596e54 自定义字段 getTabInfo 2022-06-14 15:29:22 +08:00
dxfeng 5b0864d503 添加字段分组表 2022-06-14 14:31:52 +08:00
dxfeng 61590c804d Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 2022-06-14 13:59:19 +08:00
dxfeng 2ed79cc994 添加字段分组表 2022-06-14 13:58:58 +08:00
Chengliang c3d5c50783 枚举修改 2022-06-14 11:37:27 +08:00
dxfeng eb0c55bc9e Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 
 Conflicts:
	src/com/engine/organization/entity/SelectOptionParam.java
 2022-06-14 11:18:21 +08:00
dxfeng bbe5a11f5d BUG修复 2022-06-14 11:17:39 +08:00
Chengliang fadd2577cb 修改注释 2022-06-14 11:07:48 +08:00
reset a8d6f94592
!74 自定义设置后端 
Merge pull request !74 from reset/feature/cl
 2022-06-14 01:38:27 +00:00
Chengliang 7256a94abd 自定义设置后端 2022-06-14 09:36:47 +08:00
dxfeng 0dc034c66e 部门、岗位 主表、拓展表动态添加字段、动态分组 2022-06-13 17:22:34 +08:00
dxfeng 3a075f4ec6 公司/分部 主表、拓展表动态添加字段、动态分组 2022-06-13 13:48:03 +08:00
dxfeng 49155c6893 公司/分部 主表、拓展表动态添加字段、动态分组 2022-06-10 09:18:21 +08:00
dxfeng 2ee23d5e75 BUG修复 2022-06-08 15:54:24 +08:00
dxfeng 497ed928e3 BUG修复 2022-06-08 15:52:46 +08:00
dxfeng 14725e4990 BUG修复 2022-06-08 15:21:48 +08:00
dxfeng 80a33a7787 表结构更新 BUG修复 2022-06-08 14:21:59 +08:00
dxfeng ec4e92e113 BUG修复 2022-06-08 10:38:04 +08:00
dxfeng 9877308b84 编制上报 编制变更 2022-06-08 10:25:47 +08:00
dxfeng 64cbb907e0 编制上报 编制变更 2022-06-08 09:10:47 +08:00
dxfeng 77d27801b4 编制上报 编制变更 2022-06-08 09:01:13 +08:00
dxfeng 184580bb39 权限管理 BUG修复 2022-06-07 16:28:19 +08:00
dxfeng c0332d51ba 权限管理 BUG修复 2022-06-07 15:39:45 +08:00
dxfeng 6956c0847e 权限管理 BUG修复 2022-06-07 14:57:17 +08:00
dxfeng ead9375423 自动编号 BUG修复 2022-06-07 13:44:29 +08:00
dxfeng 66f58913e9 自动编号 BUG修复 2022-06-07 13:43:21 +08:00
dxfeng de881d88b1 自动编号 BUG修复 2022-06-07 12:02:36 +08:00
dxfeng 1eb2eb3306 BUG修复 2022-06-07 10:00:23 +08:00
dxfeng 7cb6bec147 权限控制 2022-06-07 09:47:33 +08:00
dxfeng 6441726621 权限控制 2022-06-06 19:19:28 +08:00
dxfeng ad73710f0d 自动编号 2022-06-06 17:48:11 +08:00
dxfeng 0c2a4a3e68 BUG修复 2022-06-06 16:30:43 +08:00
dxfeng c0389942a9 BUG修复 2022-06-06 16:19:35 +08:00
dxfeng e7b6d44fd5 BUG修复 2022-06-06 15:52:40 +08:00
dxfeng 0282af7be6 联查岗位 请求方式 2022-06-06 15:15:12 +08:00
dxfeng eefd5b8483 自动生成编号 方法抽取 2022-06-06 14:41:46 +08:00
dxfeng d53365aba3 自动生成编号 2022-06-06 13:17:35 +08:00
dxfeng ec71f31859 部门联查岗位 2022-06-02 16:49:25 +08:00
dxfeng 96e8042156 部门合并、转移 2022-06-02 15:43:19 +08:00
dxfeng 076d099715 部门BUG修复 2022-06-02 13:38:26 +08:00
dxfeng 5252770a61 部门复制 2022-06-02 11:40:24 +08:00
dxfeng 3d9a027c8f 部门BUG修复 2022-06-02 10:53:43 +08:00
dxfeng b027a118f1 部门左侧树 部门名称命名 2022-06-02 09:58:16 +08:00
dxfeng d7f910aa84 BUG修复 岗位复制 2022-06-01 18:20:44 +08:00
dxfeng 5b2ab89a06
!42 被引用数据勾选框状态、按钮显隐 
Merge pull request !42 from dxfeng/feature/dxf
 2022-06-01 08:42:30 +00:00
dxfeng ad70d2e3d4 被引用数据勾选框状态、按钮显隐 2022-06-01 16:35:28 +08:00
Chengliang 790bf5a88a 岗位复制到部门 2022-06-01 16:20:43 +08:00
Chengliang d1dcc9d563 岗位复制和联查人员 2022-06-01 14:38:39 +08:00
dxfeng 47452c716d
!39 岗位模块功能完善 
Merge pull request !39 from dxfeng/feature/dxf
 2022-06-01 05:34:46 +00:00
dxfeng c56ec18212 岗位模块功能完善 2022-06-01 13:33:52 +08:00
dxfeng 796bdfa10f
!38 岗位模块功能完善 
Merge pull request !38 from dxfeng/feature/dxf
 2022-06-01 01:40:27 +00:00
dxfeng 6550e05a69 岗位模块功能完善 2022-05-31 21:39:20 +08:00
Chengliang aa3d3fad48 编号管理 2022-05-31 17:56:00 +08:00
Chengliang a7b8c6b89d 编号管理实体 2022-05-31 13:58:39 +08:00
dxfeng 2997cc75f6
!36 岗位模块BUG修复 
Merge pull request !36 from dxfeng/feature/dxf
 2022-05-31 05:52:35 +00:00
dxfeng 8c348f2061 岗位模块BUG修复 2022-05-31 13:50:00 +08:00
dxfeng 1a0c403991
!35 岗位表单更改 
Merge pull request !35 from dxfeng/feature/dxf
 2022-05-31 03:56:10 +00:00
dxfeng 53c95d77dc 岗位表单更改 2022-05-31 11:49:59 +08:00
dxfeng 8da146b448 岗位表单更改 2022-05-31 11:17:03 +08:00
reset 3520b36224
!34 1 
Merge pull request !34 from reset/feature/cl
 2022-05-31 02:40:08 +00:00
Chengliang 7c950e8626 编号管理 2022-05-31 10:39:07 +08:00
dxfeng 04c7ec175f 岗位表单更改 2022-05-31 10:33:19 +08:00
dxfeng bdb7e4d7b6 岗位表单更改 2022-05-31 10:02:48 +08:00
dxfeng 8f0da9a7a7 岗位表单更改 2022-05-31 10:01:33 +08:00
dxfeng 090c2659df 岗位表单更改 2022-05-31 09:56:50 +08:00
reset 6601f117cd
!31 编号管理 
Merge pull request !31 from reset/feature/cl
 2022-05-31 01:20:40 +00:00
Chengliang b4de9ae287 编号管理 2022-05-31 09:19:04 +08:00
dxfeng 7927a3ceea 包名更改 2022-05-31 09:06:57 +08:00
dxfeng 91c4116529 职务管理模块开发 2022-05-30 18:39:03 +08:00
Chengliang 3ac4461f8b table操作菜单权限 2022-05-30 16:21:15 +08:00
dxfeng 92953661ff 部门、岗位接口开发；代码合并 2022-05-29 21:41:20 +08:00
dxfeng 33f5ec9458 部门、岗位接口开发；代码合并 2022-05-27 22:20:22 +08:00
dxfeng 1ae3dcdec0 11 2022-05-27 18:05:15 +08:00
Chengliang 5eabc87fb3 checkbox控制 2022-05-27 17:04:35 +08:00
dxfeng d003e7a135
!25 编制方案 年度字段优化 
Merge pull request !25 from dxfeng/feature/dxf
 2022-05-26 05:55:50 +00:00
dxfeng 30ef0c2d84 编制方案 年度字段优化 2022-05-26 13:55:04 +08:00
dxfeng d20e8079d7
!24 编制表接口 
Merge pull request !24 from dxfeng/feature/dxf
 2022-05-26 03:07:27 +00:00
dxfeng 4abede9170 编制表接口 2022-05-26 11:06:39 +08:00
dxfeng 51ae24ea44 编制表接口 2022-05-26 11:03:04 +08:00
dxfeng 4102c56e7c
!23 编制表接口 表结构更新 
Merge pull request !23 from dxfeng/feature/dxf
 2022-05-26 02:11:58 +00:00
dxfeng b18133f790 编制表接口 表结构更新 2022-05-26 10:11:02 +08:00
Chengliang c3395b6509 联查部门修改 2022-05-26 10:04:04 +08:00
dxfeng b212122007 公司/分部BUG修复 编制方案接口 2022-05-25 16:37:44 +08:00
dxfeng 3578a0f166 明细表更新BUG修复 2022-05-25 10:56:53 +08:00
dxfeng 477df79cd1 分部列表分页 明细表字段展示 BUG修复 2022-05-25 09:54:14 +08:00
dxfeng 01ab659ef3 BUG修复 表结构更新 2022-05-24 15:15:49 +08:00
dxfeng cb1b37e05d 部门管理模块接口 拓展表通用方法抽取 2022-05-24 13:53:41 +08:00
dxfeng cd6121f0b0 部门管理 新增表单 数据保存 2022-05-23 19:16:31 +08:00
dxfeng 12e435c1cb Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 
 Conflicts:
	src/com/engine/organization/service/impl/DepartmentServiceImpl.java
 2022-05-23 17:50:06 +08:00
dxfeng cbd33dbd3b 部门管理 列表 字段文本展示 2022-05-23 17:46:37 +08:00
Chengliang f5561b8e7d 修改分页总数 2022-05-23 17:33:10 +08:00
dxfeng 39eebf62fc
!15 公司/分部 列表 字段文本展示 
Merge pull request !15 from dxfeng/feature/dxf
 2022-05-20 10:04:48 +00:00
dxfeng 4e391c5f7c 公司/分部 列表 字段文本展示 2022-05-20 18:03:27 +08:00
dxfeng e2b7ca0072
!14 公司/分部 编辑页面接口优化 
Merge pull request !14 from dxfeng/feature/dxf
 2022-05-20 09:36:01 +00:00
dxfeng a6a8053578 公司/分部 编辑页面接口优化 2022-05-20 17:34:18 +08:00
dxfeng 0cdfd1ed95
!13 公司/分部 编辑页面接口优化 
Merge pull request !13 from dxfeng/feature/dxf
 2022-05-20 08:32:04 +00:00
dxfeng b4f79d380e 公司/分部 编辑页面接口优化 2022-05-20 16:30:56 +08:00
dxfeng 11cd25a501
!12 公司/分部 拓展表 拓展明细表 接口 
Merge pull request !12 from dxfeng/feature/dxf
 2022-05-20 07:54:57 +00:00
dxfeng 0d0e7eaefe 公司/分部 拓展表 拓展明细表 接口 2022-05-20 15:52:44 +08:00
dxfeng 0b9a5878eb 公司/分部 拓展表 拓展明细表 接口 2022-05-20 15:52:25 +08:00
dxfeng bd67e3c913
!11 公司/分部 主表拓展表 明细表拓展表接口 
Merge pull request !11 from dxfeng/feature/dxf
 2022-05-20 07:09:53 +00:00
dxfeng 362b64ae66 公司/分部 拓展表 拓展明细表 接口 2022-05-20 15:06:27 +08:00
reset 009ce6f876
!10 联查部门 
Merge pull request !10 from reset/feature/cl
 2022-05-20 07:02:47 +00:00
Chengliang 634f2d6b09 联查部门 2022-05-20 15:00:03 +08:00
dxfeng 1bc660ab8d 公司/分部 新增、编辑表单 表结构更新 2022-05-19 18:47:03 +08:00
dxfeng d6c8ac96c2 公司/分部 基础表单、tab构建 2022-05-18 18:06:01 +08:00
dxfeng e15168aa0a 公司/分部 列表展示列更新 2022-05-18 10:06:30 +08:00
dxfeng 21cddc290f 公司/分部 搜索、按钮、禁用/启用、删除接口 2022-05-18 09:59:34 +08:00
dxfeng 5b088ce146 公司/分部 列表接口 2022-05-18 09:17:01 +08:00
dxfeng 5e8041348a 公司/分部 列表接口 2022-05-17 16:36:53 +08:00
dxfeng b2fd60a9bc 集团管理 更新接口 2022-05-17 16:12:31 +08:00
dxfeng 6978eb5246 公司/分部管理 列表接口 2022-05-17 13:34:00 +08:00
dxfeng 273e29fbe9 职务信息 禁用标识接口 表结构更新 2022-05-16 16:26:21 +08:00
dxfeng fae1bd776b 集团管理接口 2022-05-16 14:29:11 +08:00
dxfeng c8bf7c1633 集团管理接口 2022-05-16 11:33:19 +08:00
dxfeng 6f24a67ff0 职务分类左侧树接口 2022-05-13 17:10:00 +08:00
dxfeng f576df3495 职务信息接口 2022-05-13 16:05:10 +08:00
dxfeng 8e4d698217 职务分类接口 表结构更新 2022-05-13 10:32:33 +08:00
dxfeng 902f845543 岗位序列模块 2022-05-12 17:13:40 +08:00
dxfeng 23944db568 职级列表 职等信息展示 2022-05-12 14:27:10 +08:00
dxfeng c445185f0d 统计BUG修复 2022-05-12 13:49:33 +08:00
dxfeng 28009eee70 职级接口、表结构完善 2022-05-12 13:22:54 +08:00
dxfeng 9a5939fac4 职等接口 2022-05-12 10:14:17 +08:00
dxfeng c168f4bff9 职等接口 2022-05-12 10:13:19 +08:00
dxfeng 8e6bd9e90a tabinfo搜索条件修复 2022-05-12 09:32:08 +08:00
dxfeng 0dea1b6ae4 职级接口 职等搜索条件修复 2022-05-11 18:27:52 +08:00
Chengliang 2f54556afd 修改topTap 2022-05-11 16:29:08 +08:00
dxfeng 2d53588d39 职级接口 实现类注解修改 2022-05-11 15:37:17 +08:00
Chengliang 16eac38210 修改tabInfo url 2022-05-11 14:43:33 +08:00
dxfeng 1ce7ae9518 职等职级接口 getTableInfo接口 2022-05-11 14:38:08 +08:00
dxfeng c5a7a1fb07 职等职级接口 浏览框定义 2022-05-11 13:38:58 +08:00
dxfeng 7bd87d4707 职等职级接口 表结构SQL更新 2022-05-10 21:07:50 +08:00
dxfeng 97ac4e5cdf 等级方案 职等职级接口 2022-05-10 15:48:44 +08:00
dxfeng 2e6343a813 等级方案 职等职级接口 2022-05-10 14:54:49 +08:00
dxfeng 0f9c8572a3 等级方案 职等职级接口 2022-05-10 13:49:36 +08:00
dxfeng 2775d2486e 登记方案 职等职级接口 2022-05-10 11:05:17 +08:00
dxfeng 4f51589a84 登记方案 职等职级接口 2022-05-10 10:54:41 +08:00
dxfeng c32eeed79c 表单工具类，rules用到时单独设置 2022-05-09 15:53:30 +08:00
dxfeng 2f282aa5c4 等级方案 接口优化 2022-05-09 14:40:18 +08:00
Chengliang 50fe97e4b7 修改列表 2022-05-09 09:26:50 +08:00
dxfeng 68795ade06 等级方案 增删改查接口 2022-05-07 22:03:42 +08:00
dxfeng 932105a8a0 等级方案 实体类 查询接口 2022-05-07 14:45:35 +08:00
dxfeng 276247c161 职等职级 实体类 查询接口 2022-05-07 11:32:48 +08:00
dxfeng 40f3585310 职等职级 实体类 查询接口 2022-05-07 10:18:50 +08:00
Chengliang 1c3c88efa4 基于weaverboot 实现后端架构（推荐使用 2022-04-28 15:59:48 +08:00
Chengliang 3587eddc75 日志记录v1.0 2022-04-28 13:52:09 +08:00
Chengliang e0b8a57c0d 新建自定义日志模块 2022-04-28 09:46:52 +08:00
Chengliang e7742fdfe0 初始化引入工具类 2022-04-27 16:48:22 +08:00
Chengliang b6c920dc64 后台搭建 统一消息返回 2022-04-26 18:41:44 +08:00