 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 |
|
Chengliang
|
c3395b6509
|
联查部门修改
|
2022-05-26 10:04:04 +08:00 |
|
dxfeng
|
b212122007
|
公司/分部BUG修复 编制方案接口
|
2022-05-25 16:37:44 +08:00 |
|
dxfeng
|
477df79cd1
|
分部列表分页 明细表字段展示 BUG修复
|
2022-05-25 09:54:14 +08:00 |
|
dxfeng
|
01ab659ef3
|
BUG修复 表结构更新
|
2022-05-24 15:15:49 +08:00 |
|
dxfeng
|
cb1b37e05d
|
部门管理模块接口 拓展表通用方法抽取
|
2022-05-24 13:53:41 +08:00 |
|
dxfeng
|
cbd33dbd3b
|
部门管理 列表 字段文本展示
|
2022-05-23 17:46:37 +08:00 |
|
dxfeng
|
e2b7ca0072
|
!14 公司/分部 编辑页面接口优化
Merge pull request !14 from dxfeng/feature/dxf
|
2022-05-20 09:36:01 +00:00 |
|
dxfeng
|
a6a8053578
|
公司/分部 编辑页面接口优化
|
2022-05-20 17:34:18 +08:00 |
|
dxfeng
|
11cd25a501
|
!12 公司/分部 拓展表 拓展明细表 接口
Merge pull request !12 from dxfeng/feature/dxf
|
2022-05-20 07:54:57 +00:00 |
|
dxfeng
|
0b9a5878eb
|
公司/分部 拓展表 拓展明细表 接口
|
2022-05-20 15:52:25 +08:00 |
|
dxfeng
|
bd67e3c913
|
!11 公司/分部 主表拓展表 明细表拓展表接口
Merge pull request !11 from dxfeng/feature/dxf
|
2022-05-20 07:09:53 +00:00 |
|
dxfeng
|
362b64ae66
|
公司/分部 拓展表 拓展明细表 接口
|
2022-05-20 15:06:27 +08:00 |
|
reset
|
009ce6f876
|
!10 联查部门
Merge pull request !10 from reset/feature/cl
|
2022-05-20 07:02:47 +00:00 |
|
Chengliang
|
634f2d6b09
|
联查部门
|
2022-05-20 15:00:03 +08:00 |
|
dxfeng
|
1bc660ab8d
|
公司/分部 新增、编辑表单 表结构更新
|
2022-05-19 18:47:03 +08:00 |
|
dxfeng
|
d6c8ac96c2
|
公司/分部 基础表单、tab构建
|
2022-05-18 18:06:01 +08:00 |
|
dxfeng
|
5b088ce146
|
公司/分部 列表接口
|
2022-05-18 09:17:01 +08:00 |
|
dxfeng
|
5e8041348a
|
公司/分部 列表接口
|
2022-05-17 16:36:53 +08:00 |
|
dxfeng
|
b2fd60a9bc
|
集团管理 更新接口
|
2022-05-17 16:12:31 +08:00 |
|
dxfeng
|
6978eb5246
|
公司/分部管理 列表接口
|
2022-05-17 13:34:00 +08:00 |
|
dxfeng
|
273e29fbe9
|
职务信息 禁用标识接口 表结构更新
|
2022-05-16 16:26:21 +08:00 |
|
dxfeng
|
6f24a67ff0
|
职务分类左侧树接口
|
2022-05-13 17:10:00 +08:00 |
|
dxfeng
|
f576df3495
|
职务信息接口
|
2022-05-13 16:05:10 +08:00 |
|
dxfeng
|
8e4d698217
|
职务分类接口 表结构更新
|
2022-05-13 10:32:33 +08:00 |
|
dxfeng
|
902f845543
|
岗位序列模块
|
2022-05-12 17:13:40 +08:00 |
|
dxfeng
|
c445185f0d
|
统计BUG修复
|
2022-05-12 13:49:33 +08:00 |
|
dxfeng
|
28009eee70
|
职级接口、表结构完善
|
2022-05-12 13:22:54 +08:00 |
|
dxfeng
|
9a5939fac4
|
职等接口
|
2022-05-12 10:14:17 +08:00 |