Commit Graph

335 Commits

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