Commit Graph

182 Commits (f7ce6b028a4f98ba0145eb25a49c64d342ae6894)

Author SHA1 Message Date
dxfeng b494a6a96e BUG修复 3 years ago
dxfeng 50e5c7312e 编制导入 3 years ago
dxfeng 8b7b75b57b Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
dxfeng 35439a442f BUG 修复 3 years ago
Chengliang fbd608a52a 顶部按钮修改 3 years ago
dxfeng 0a87a2ad4d Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
Chengliang c280c5f908 fixed 3 years ago
dxfeng 59f76c012c 触发器,分部、部门赋值,SQL脚本 3 years ago
Chengliang 8553e37c22 fixed 3 years ago
Chengliang 819a053aa3 fixed 3 years ago
dxfeng b49a25742a 触发器、非标开关 3 years ago
dxfeng 1f7f299368 分部、部门、岗位触发器 3 years ago
dxfeng 532a6d00ce 人员信息分类 3 years ago
dxfeng 6351109b79 人员信息分类 3 years ago
Chengliang ca7d34a5bd 人员信息模块 3 years ago
Chengliang 8043012b41 人基础员信息 3 years ago
dxfeng 5cce107318 BUG修复,权限控制 3 years ago
dxfeng 3acec4730d BUG修复,权限控制 3 years ago
dxfeng f27612db94 Oracle BUG修复 3 years ago
dxfeng 6576335c6c BUG修复 3 years ago
dxfeng 08a9ab7b0d BUG修复 3 years ago
dxfeng 0e3fc1a238 同步CusFieldData数据接口 3 years ago
dxfeng ceb3484d6d 编制方案需求完善 3 years ago
dxfeng 0a47b3548d 人员导入 3 years ago
dxfeng fc8aaf7729 部门导入、日志记录 3 years ago
dxfeng c23127acc2 分部导入、日志记录 3 years ago
dxfeng b1365da225 分部导入 3 years ago
dxfeng 9d304b0303 分部导入 3 years ago
MustangDeng cc318fa73c Merge branch 'feature/djp' into develop 3 years ago
MustangDeng 0a1e6c6e7d feature: 组织架构异步数据v1.0 3 years ago
Chengliang a1ed3e45c9 需求优化2 3 years ago
dxfeng 81fcd96af6 人员拓展卡片 3 years ago
670124965@qq.com 58f3aedf9d Merge branch 'feature/djp' into develop 3 years ago
dxfeng 7103eb0c73 记录操作日志 3 years ago
dxfeng 40a7c066a2 记录操作日志 3 years ago
MustangDeng b589056585 组织结构图接口 3 years ago
dxfeng 2702b175cd 记录操作日志 3 years ago
dxfeng bef63439b2 记录操作日志 3 years ago
dxfeng 278194a4a3 记录操作日志,岗位优化 3 years ago
dxfeng f5d95fabb2 记录操作日志 3 years ago
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
3 years ago
dxfeng 033e90aa34 操作日志 3 years ago
Chengliang 46aeddea39 需求调整 3 years ago
reset be94ae88e7
!129 1
Merge pull request !129 from reset/feature/cl
3 years ago
Chengliang 300ccd6d77 “导出修改” 3 years ago
dxfeng 9b54954ef8 人员导入 3 years ago
dxfeng 5ceb8ae068 Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf 3 years ago
Chengliang 0ad6157c26 人员导出功能 3 years ago
dxfeng 4eef6f62de 人员导入 3 years ago
dxfeng d0ea50cec5 部门、岗位 合并 3 years ago
dxfeng db4e066294 复制分部 表结构更新 3 years ago
dxfeng 2ea923f9c9 转移分部 3 years ago
dxfeng 6c40245b02 组织人事测试、优化 3 years ago
dxfeng f72db1b5f9 组织人事测试、优化 3 years ago
dxfeng bdc813000e 人员管理查询条件 按钮接口,
是否禁用名称更改
3 years ago
dxfeng 5b6cf8fe72 人员管理新增、编辑相关接口 3 years ago
dxfeng 187be45bdf 人员管理:左侧树、列表接口 3 years ago
dxfeng 2af1fb6336 移动到组 3 years ago
dxfeng 6df1accb98 BUG 修复 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 08ca2e0c5d 自定义字段列表 3 years ago
dxfeng 52c964f199 添加自定义字段接口 3 years ago
dxfeng 57b29a2312 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 f4f7038611 新增编辑类型 3 years ago
Chengliang 032a363985 自定义页面树 3 years ago
dxfeng b4b54fa1e1 分组维护 新建分组 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
Chengliang 6b1ce95b48 自定义设置页面树 3 years ago
dxfeng 9259596e54 自定义字段 getTabInfo 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 0dc034c66e 部门、岗位 主表、拓展表动态添加字段、动态分组 3 years ago
dxfeng 49155c6893 公司/分部 主表、拓展表动态添加字段、动态分组 3 years ago
dxfeng d53365aba3 自动生成编号 3 years ago
dxfeng ec71f31859 部门联查岗位 3 years ago
dxfeng 96e8042156 部门合并、转移 3 years ago
dxfeng 5252770a61 部门复制 3 years ago
dxfeng b027a118f1 部门左侧树 部门名称命名 3 years ago
dxfeng d7f910aa84 BUG修复 岗位复制 3 years ago
Chengliang 790bf5a88a 岗位复制到部门 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 7c950e8626 编号管理 3 years ago
reset 6601f117cd
!31 编号管理
Merge pull request !31 from reset/feature/cl
3 years ago
Chengliang b4de9ae287 编号管理 3 years ago
dxfeng 7927a3ceea 包名更改 3 years ago
dxfeng 91c4116529 职务管理模块开发 3 years ago
dxfeng 1ae3dcdec0 11 3 years ago
dxfeng b18133f790 编制表接口 表结构更新 3 years ago
dxfeng b212122007 公司/分部BUG修复 编制方案接口 3 years ago
dxfeng cd6121f0b0 部门管理 新增表单 数据保存 3 years ago