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

193 Commits

Author SHA1 Message Date
Chengliang ca7d34a5bd 人员信息模块 2022-08-24 17:57:04 +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 ff8660a586 BUG修复 2022-08-22 09:10:00 +08:00
dxfeng 3acec4730d BUG修复，权限控制 2022-08-17 19:29:46 +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 f27612db94 Oracle BUG修复 2022-08-11 10:43:52 +08:00
dxfeng 6576335c6c BUG修复 2022-08-10 15:37:23 +08:00
dxfeng 08a9ab7b0d BUG修复 2022-08-10 15:25:34 +08:00
dxfeng 1c9b1abe69 编制方案需求完善 2022-08-02 14:42:25 +08:00
dxfeng 7b88ba5a78 编制方案需求完善 2022-08-02 13:39:47 +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 fc8aaf7729 部门导入、日志记录 2022-07-27 10:48:43 +08:00
dxfeng b1365da225 分部导入 2022-07-26 16:33:41 +08:00
dxfeng 9d304b0303 分部导入 2022-07-26 09:40:13 +08:00
dxfeng 56a697d4e4 BUG 修复 2022-07-22 16:02:32 +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 e217ecbe16 分部更新EC 2022-07-13 10:55:44 +08:00
dxfeng b52bb93dfa 人员拓展卡片、分部更新EC 2022-07-12 16:38:27 +08:00
dxfeng 81fcd96af6 人员拓展卡片 2022-07-11 15:59:15 +08:00
dxfeng 7103eb0c73 记录操作日志 2022-07-07 15:32:30 +08:00
dxfeng 40a7c066a2 记录操作日志 2022-07-07 14:19:56 +08:00
dxfeng f5d95fabb2 记录操作日志 2022-07-05 15:15:00 +08:00
dxfeng 033e90aa34 操作日志 2022-07-05 09:39:00 +08:00
dxfeng 03f59d55d0 人员列表查询系统表 异常信息处理 2022-07-04 09:18:56 +08:00
dxfeng 5291c3b855 分部列表BUG修复 2022-07-01 17:46:25 +08:00
dxfeng fca0bb4dad 人员导入 2022-07-01 14:02:03 +08:00
dxfeng d508a4d9d0 人员导入，日志表结构 2022-06-30 16:22:57 +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 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 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 d0ea50cec5 部门、岗位 合并 2022-06-24 18:26:15 +08:00
dxfeng 15131186de 分部、部门、岗位列表排序 2022-06-23 18:49:47 +08:00
dxfeng 6c40245b02 组织人事测试、优化 2022-06-23 16:55:26 +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 187be45bdf 人员管理：左侧树、列表接口 2022-06-21 13:49:37 +08:00
dxfeng b8f866e28b 人员树接口 2022-06-20 18:31:11 +08:00
dxfeng abf99aaa51 BUG修复 2022-06-20 14:50:59 +08:00
dxfeng 2af1fb6336 移动到组 2022-06-20 09:09:14 +08:00
dxfeng 6df1accb98 BUG 修复 2022-06-17 16:54:16 +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 e9aa68229d 表结构更新 2022-06-17 11:48:15 +08:00
dxfeng 445507d10d 表结构更新 2022-06-17 10:54:59 +08:00
Chengliang b60a335a1c 新增类型修改 2022-06-17 10:39:52 +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 52c964f199 添加自定义字段接口 2022-06-16 14:19:54 +08:00
dxfeng e588fb0c96 BUG修复 2022-06-16 09:37:36 +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 f4f7038611 新增编辑类型 2022-06-15 17:17:34 +08:00
dxfeng b4b54fa1e1 分组维护 新建分组 2022-06-15 11:25:23 +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 2ed79cc994 添加字段分组表 2022-06-14 13:58:58 +08:00
Chengliang fadd2577cb 修改注释 2022-06-14 11:07:48 +08:00
dxfeng 3a075f4ec6 公司/分部 主表、拓展表动态添加字段、动态分组 2022-06-13 13:48:03 +08:00
dxfeng 49155c6893 公司/分部 主表、拓展表动态添加字段、动态分组 2022-06-10 09:18:21 +08:00
dxfeng 9877308b84 编制上报 编制变更 2022-06-08 10:25:47 +08:00
dxfeng 77d27801b4 编制上报 编制变更 2022-06-08 09:01:13 +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 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
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
dxfeng 8c348f2061 岗位模块BUG修复 2022-05-31 13:50:00 +08:00
dxfeng 03e0f6ee60 包名更改 2022-05-31 09:09:13 +08:00
dxfeng 91c4116529 职务管理模块开发 2022-05-30 18:39:03 +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
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