Commit Graph

206 Commits (92d9a17d8c26906cf02d58fd20b9557a4c70f43b)

Author SHA1 Message Date
dxfeng 15c9ef7e61 分部、部门 添加UUID列;部门表结构更新 3 years ago
dxfeng e217ecbe16 分部更新EC 3 years ago
dxfeng b52bb93dfa 人员拓展卡片、分部更新EC 3 years ago
dxfeng 81fcd96af6 人员拓展卡片 3 years ago
dxfeng 2175d7ca6a 记录操作日志 3 years ago
dxfeng 7103eb0c73 记录操作日志 3 years ago
dxfeng 40a7c066a2 记录操作日志 3 years ago
dxfeng 2702b175cd 记录操作日志 3 years ago
dxfeng cca52d7080 记录操作日志 3 years ago
dxfeng c139cd408a 记录操作日志 3 years ago
dxfeng bef63439b2 记录操作日志 3 years ago
dxfeng 278194a4a3 记录操作日志,岗位优化 3 years ago
dxfeng f5d95fabb2 记录操作日志 3 years ago
dxfeng 033e90aa34 操作日志 3 years ago
dxfeng 03f59d55d0 人员列表查询系统表 异常信息处理 3 years ago
dxfeng 5291c3b855 分部列表BUG修复 3 years ago
dxfeng 26ef362eb4 组织导入 3 years ago
dxfeng 3f6b2c340b 人员导入 3 years ago
dxfeng 5ceb8ae068 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng ff06d705e7 人员导入 3 years ago
dxfeng 2fb33877f5 人员导入 3 years ago
Chengliang 0ad6157c26 人员导出功能 3 years ago
dxfeng 4eef6f62de 人员导入 3 years ago
Chengliang 82aa37e2ed bug修复 增加导入 3 years ago
dxfeng d0ea50cec5 部门、岗位 合并 3 years ago
dxfeng 15131186de 分部、部门、岗位列表排序 3 years ago
dxfeng 6c40245b02 组织人事测试、优化 3 years ago
dxfeng de1d4a8944 组织人事测试、优化 3 years ago
dxfeng f035662fb6 组织人事测试、优化 3 years ago
dxfeng eeb8c47451 组织人事测试、优化 3 years ago
dxfeng f72db1b5f9 组织人事测试、优化 3 years ago
dxfeng 779e03cb32 修改时,编号可以修改 3 years ago
dxfeng 9796bdc823 修改时,编号可以修改 3 years ago
dxfeng 0b78da90ce Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng bdc813000e 人员管理查询条件 按钮接口,
是否禁用名称更改
3 years ago
reset 9ab987c01b
!110 增加排序
Merge pull request !110 from reset/feature/cl
3 years ago
Chengliang d3bcc35f31 增加排序 3 years ago
dxfeng 5b6cf8fe72 人员管理新增、编辑相关接口 3 years ago
dxfeng 187be45bdf 人员管理:左侧树、列表接口 3 years ago
dxfeng b8f866e28b 人员树接口 3 years ago
dxfeng abf99aaa51 BUG修复 3 years ago
Chengliang 95744654b7 优化 3 years ago
dxfeng 2a57f20693 BUG 修复 3 years ago
dxfeng 6df1accb98 BUG 修复 3 years ago
dxfeng caff3332ce BUG 修复 3 years ago
dxfeng e9aa68229d 表结构更新 3 years ago
dxfeng 445507d10d 表结构更新 3 years ago
dxfeng c8604a8e40 数据返回格式修改 3 years ago
dxfeng 9aebfbcecc 字段删除 移动分组 3 years ago
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
3 years ago
Chengliang 6d4448ec51 子信息维护 3 years ago
dxfeng 4d2a70ad5d 自定义字段列表接口 3 years ago
dxfeng 08ca2e0c5d 自定义字段列表 3 years ago
dxfeng 52c964f199 添加自定义字段接口 3 years ago
dxfeng e588fb0c96 BUG修复 3 years ago
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
3 years ago
dxfeng 7c02e9bc61 分组删除 新增自定义字段 3 years ago
Chengliang 8564d29bf1 新增类型默认title 3 years ago
Chengliang f4f7038611 新增编辑类型 3 years ago
Chengliang 032a363985 自定义页面树 3 years ago
dxfeng c8112bd701
!82 分组维护 新建分组
Merge pull request !82 from dxfeng/feature/dxf
3 years ago
dxfeng b4b54fa1e1 分组维护 新建分组 3 years ago
reset 07cb72c05c
!80 11
Merge pull request !80 from reset/feature/cl
3 years ago
Chengliang cde0608e02 自定义树页面修好 3 years ago
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
3 years ago
reset 6e7c76ac0d
!78 自定义设置页面树
Merge pull request !78 from reset/feature/cl
3 years ago
Chengliang 6b1ce95b48 自定义设置页面树 3 years ago
dxfeng 9259596e54 自定义字段 getTabInfo 3 years ago
dxfeng 2ed79cc994 添加字段分组表 3 years ago
dxfeng eb0c55bc9e Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
 Conflicts:
	src/com/engine/organization/entity/SelectOptionParam.java
3 years ago
dxfeng bbe5a11f5d BUG修复 3 years ago
Chengliang fadd2577cb 修改注释 3 years ago
reset a8d6f94592
!74 自定义设置后端
Merge pull request !74 from reset/feature/cl
3 years ago
Chengliang 7256a94abd 自定义设置后端 3 years ago
dxfeng 3a075f4ec6 公司/分部 主表、拓展表动态添加字段、动态分组 3 years ago
dxfeng 49155c6893 公司/分部 主表、拓展表动态添加字段、动态分组 3 years ago
dxfeng 497ed928e3 BUG修复 3 years ago
dxfeng 64cbb907e0 编制上报 编制变更 3 years ago
dxfeng 77d27801b4 编制上报 编制变更 3 years ago
dxfeng 6956c0847e 权限管理 BUG修复 3 years ago
dxfeng de881d88b1 自动编号 BUG修复 3 years ago
dxfeng ad73710f0d 自动编号 3 years ago
dxfeng d53365aba3 自动生成编号 3 years ago
dxfeng ec71f31859 部门联查岗位 3 years ago
dxfeng 96e8042156 部门合并、转移 3 years ago
dxfeng 076d099715 部门BUG修复 3 years ago
dxfeng 5252770a61 部门复制 3 years ago
dxfeng 3d9a027c8f 部门BUG修复 3 years ago
dxfeng b027a118f1 部门左侧树 部门名称命名 3 years ago
dxfeng d7f910aa84 BUG修复 岗位复制 3 years ago
dxfeng 5b2ab89a06
!42 被引用数据勾选框状态、按钮显隐
Merge pull request !42 from dxfeng/feature/dxf
3 years ago
dxfeng ad70d2e3d4 被引用数据勾选框状态、按钮显隐 3 years ago
Chengliang d1dcc9d563 岗位复制和联查人员 3 years ago
dxfeng 796bdfa10f
!38 岗位模块功能完善
Merge pull request !38 from dxfeng/feature/dxf
3 years ago
dxfeng 6550e05a69 岗位模块功能完善 3 years ago
Chengliang aa3d3fad48 编号管理 3 years ago
Chengliang a7b8c6b89d 编号管理实体 3 years ago
dxfeng 8c348f2061 岗位模块BUG修复 3 years ago
dxfeng 8da146b448 岗位表单更改 3 years ago
reset 6601f117cd
!31 编号管理
Merge pull request !31 from reset/feature/cl
3 years ago