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

658 Commits

Author SHA1 Message Date
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