 Chengliang
|
b60a335a1c
|
新增类型修改
|
2022-06-17 10:39:52 +08:00 |
 dxfeng
|
c8604a8e40
|
数据返回格式修改
|
2022-06-17 09:45:32 +08:00 |
|
dxfeng
|
9aebfbcecc
|
字段删除 移动分组
|
2022-06-16 18:26:12 +08:00 |
|
dxfeng
|
3ba19c1b8d
|
代码合并
|
2022-06-16 18:08:06 +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
|
08ca2e0c5d
|
自定义字段列表
|
2022-06-16 16:10:33 +08:00 |
|
dxfeng
|
52c964f199
|
添加自定义字段接口
|
2022-06-16 14:19:54 +08:00 |
|
dxfeng
|
57b29a2312
|
BUG修复
|
2022-06-16 09:55:07 +08:00 |
|
dxfeng
|
e588fb0c96
|
BUG修复
|
2022-06-16 09:37:36 +08:00 |
|
dxfeng
|
70de6bbbd7
|
处理代码冲突
|
2022-06-15 18:12:53 +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
|
8564d29bf1
|
新增类型默认title
|
2022-06-15 17:56:29 +08:00 |
|
Chengliang
|
f4f7038611
|
新增编辑类型
|
2022-06-15 17:17:34 +08:00 |
|
Chengliang
|
068c446765
|
solve conflict
|
2022-06-15 11:41:44 +08:00 |
|
Chengliang
|
032a363985
|
自定义页面树
|
2022-06-15 11:36:48 +08:00 |
|
dxfeng
|
c8112bd701
|
!82 分组维护 新建分组
Merge pull request !82 from dxfeng/feature/dxf
|
2022-06-15 03:26:31 +00:00 |
|
dxfeng
|
b4b54fa1e1
|
分组维护 新建分组
|
2022-06-15 11:25:23 +08:00 |
|
dxfeng
|
1c7b232172
|
!81 代码合并
Merge pull request !81 from dxfeng/feature/dxf
|
2022-06-14 10:04:22 +00:00 |
|
dxfeng
|
d809107c48
|
代码合并
|
2022-06-14 18:03:35 +08:00 |
|
reset
|
07cb72c05c
|
!80 11
Merge pull request !80 from reset/feature/cl
|
2022-06-14 10:01:35 +00:00 |
|
Chengliang
|
cde0608e02
|
自定义树页面修好
|
2022-06-14 18:00:51 +08:00 |
|
dxfeng
|
568c9411da
|
代码合并
|
2022-06-14 17:57:41 +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
|
61590c804d
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
|
2022-06-14 13:59:19 +08:00 |
|
dxfeng
|
2ed79cc994
|
添加字段分组表
|
2022-06-14 13:58:58 +08:00 |
|
Chengliang
|
c3d5c50783
|
枚举修改
|
2022-06-14 11:37:27 +08:00 |
|
dxfeng
|
eb0c55bc9e
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
Conflicts:
src/com/engine/organization/entity/SelectOptionParam.java
|
2022-06-14 11:18:21 +08:00 |
|
dxfeng
|
bbe5a11f5d
|
BUG修复
|
2022-06-14 11:17:39 +08:00 |
|
Chengliang
|
fadd2577cb
|
修改注释
|
2022-06-14 11:07:48 +08:00 |
|
reset
|
a8d6f94592
|
!74 自定义设置后端
Merge pull request !74 from reset/feature/cl
|
2022-06-14 01:38:27 +00:00 |
|
Chengliang
|
7256a94abd
|
自定义设置后端
|
2022-06-14 09:36:47 +08:00 |
|
dxfeng
|
0dc034c66e
|
部门、岗位 主表、拓展表动态添加字段、动态分组
|
2022-06-13 17:22:34 +08:00 |
|
dxfeng
|
3a075f4ec6
|
公司/分部 主表、拓展表动态添加字段、动态分组
|
2022-06-13 13:48:03 +08:00 |
|
dxfeng
|
49155c6893
|
公司/分部 主表、拓展表动态添加字段、动态分组
|
2022-06-10 09:18:21 +08:00 |
|
dxfeng
|
2ee23d5e75
|
BUG修复
|
2022-06-08 15:54:24 +08:00 |
|
dxfeng
|
497ed928e3
|
BUG修复
|
2022-06-08 15:52:46 +08:00 |
|
dxfeng
|
14725e4990
|
BUG修复
|
2022-06-08 15:21:48 +08:00 |
|
dxfeng
|
80a33a7787
|
表结构更新 BUG修复
|
2022-06-08 14:21:59 +08:00 |
|
dxfeng
|
ec4e92e113
|
BUG修复
|
2022-06-08 10:38:04 +08:00 |
|
dxfeng
|
9877308b84
|
编制上报 编制变更
|
2022-06-08 10:25:47 +08:00 |
|
dxfeng
|
64cbb907e0
|
编制上报 编制变更
|
2022-06-08 09:10:47 +08:00 |
|
dxfeng
|
77d27801b4
|
编制上报 编制变更
|
2022-06-08 09:01:13 +08:00 |
|
dxfeng
|
184580bb39
|
权限管理 BUG修复
|
2022-06-07 16:28:19 +08:00 |
|
dxfeng
|
c0332d51ba
|
权限管理 BUG修复
|
2022-06-07 15:39:45 +08:00 |
|
dxfeng
|
6956c0847e
|
权限管理 BUG修复
|
2022-06-07 14:57:17 +08:00 |
|
dxfeng
|
ead9375423
|
自动编号 BUG修复
|
2022-06-07 13:44:29 +08:00 |
|
dxfeng
|
66f58913e9
|
自动编号 BUG修复
|
2022-06-07 13:43:21 +08:00 |
|
dxfeng
|
de881d88b1
|
自动编号 BUG修复
|
2022-06-07 12:02:36 +08:00 |
|
dxfeng
|
1eb2eb3306
|
BUG修复
|
2022-06-07 10:00:23 +08:00 |
|
dxfeng
|
7cb6bec147
|
权限控制
|
2022-06-07 09:47:33 +08:00 |
|
dxfeng
|
6441726621
|
权限控制
|
2022-06-06 19:19:28 +08:00 |
|
dxfeng
|
ad73710f0d
|
自动编号
|
2022-06-06 17:48:11 +08:00 |
|
dxfeng
|
0c2a4a3e68
|
BUG修复
|
2022-06-06 16:30:43 +08:00 |
|
dxfeng
|
c0389942a9
|
BUG修复
|
2022-06-06 16:19:35 +08:00 |
|
dxfeng
|
e7b6d44fd5
|
BUG修复
|
2022-06-06 15:52:40 +08:00 |
|
dxfeng
|
0282af7be6
|
联查岗位 请求方式
|
2022-06-06 15:15:12 +08:00 |
|
dxfeng
|
eefd5b8483
|
自动生成编号 方法抽取
|
2022-06-06 14:41:46 +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
|
3d9a027c8f
|
部门BUG修复
|
2022-06-02 10:53:43 +08:00 |
|
dxfeng
|
b027a118f1
|
部门左侧树 部门名称命名
|
2022-06-02 09:58:16 +08:00 |
|
dxfeng
|
d7f910aa84
|
BUG修复 岗位复制
|
2022-06-01 18:20:44 +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 |
|
Chengliang
|
790bf5a88a
|
岗位复制到部门
|
2022-06-01 16:20:43 +08:00 |
|
Chengliang
|
d1dcc9d563
|
岗位复制和联查人员
|
2022-06-01 14:38:39 +08:00 |
|
dxfeng
|
47452c716d
|
!39 岗位模块功能完善
Merge pull request !39 from dxfeng/feature/dxf
|
2022-06-01 05:34:46 +00:00 |
|
dxfeng
|
c56ec18212
|
岗位模块功能完善
|
2022-06-01 13:33:52 +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 |
|
Chengliang
|
a7b8c6b89d
|
编号管理实体
|
2022-05-31 13:58:39 +08:00 |
|
dxfeng
|
2997cc75f6
|
!36 岗位模块BUG修复
Merge pull request !36 from dxfeng/feature/dxf
|
2022-05-31 05:52:35 +00:00 |
|
dxfeng
|
8c348f2061
|
岗位模块BUG修复
|
2022-05-31 13:50:00 +08:00 |
|
dxfeng
|
1a0c403991
|
!35 岗位表单更改
Merge pull request !35 from dxfeng/feature/dxf
|
2022-05-31 03:56:10 +00:00 |
|
dxfeng
|
53c95d77dc
|
岗位表单更改
|
2022-05-31 11:49:59 +08:00 |
|
dxfeng
|
8da146b448
|
岗位表单更改
|
2022-05-31 11:17:03 +08:00 |
|
reset
|
3520b36224
|
!34 1
Merge pull request !34 from reset/feature/cl
|
2022-05-31 02:40:08 +00:00 |
|
Chengliang
|
7c950e8626
|
编号管理
|
2022-05-31 10:39:07 +08:00 |
|
dxfeng
|
04c7ec175f
|
岗位表单更改
|
2022-05-31 10:33:19 +08:00 |
|
dxfeng
|
bdb7e4d7b6
|
岗位表单更改
|
2022-05-31 10:02:48 +08:00 |
|
dxfeng
|
8f0da9a7a7
|
岗位表单更改
|
2022-05-31 10:01:33 +08:00 |
|
dxfeng
|
090c2659df
|
岗位表单更改
|
2022-05-31 09:56:50 +08:00 |
|
reset
|
6601f117cd
|
!31 编号管理
Merge pull request !31 from reset/feature/cl
|
2022-05-31 01:20:40 +00:00 |
|
Chengliang
|
b4de9ae287
|
编号管理
|
2022-05-31 09:19:04 +08:00 |
|
dxfeng
|
7927a3ceea
|
包名更改
|
2022-05-31 09:06:57 +08:00 |
|
dxfeng
|
91c4116529
|
职务管理模块开发
|
2022-05-30 18:39:03 +08:00 |
|
Chengliang
|
3ac4461f8b
|
table操作菜单权限
|
2022-05-30 16:21:15 +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 |
|
Chengliang
|
5eabc87fb3
|
checkbox控制
|
2022-05-27 17:04:35 +08:00 |
|
dxfeng
|
d003e7a135
|
!25 编制方案 年度字段优化
Merge pull request !25 from dxfeng/feature/dxf
|
2022-05-26 05:55:50 +00:00 |
|
dxfeng
|
30ef0c2d84
|
编制方案 年度字段优化
|
2022-05-26 13:55:04 +08:00 |
|
dxfeng
|
d20e8079d7
|
!24 编制表接口
Merge pull request !24 from dxfeng/feature/dxf
|
2022-05-26 03:07:27 +00:00 |
|
dxfeng
|
4abede9170
|
编制表接口
|
2022-05-26 11:06:39 +08:00 |
|
dxfeng
|
51ae24ea44
|
编制表接口
|
2022-05-26 11:03:04 +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
|
3578a0f166
|
明细表更新BUG修复
|
2022-05-25 10:56:53 +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
|
cd6121f0b0
|
部门管理 新增表单 数据保存
|
2022-05-23 19:16:31 +08:00 |
|
dxfeng
|
12e435c1cb
|
Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf
Conflicts:
src/com/engine/organization/service/impl/DepartmentServiceImpl.java
|
2022-05-23 17:50:06 +08:00 |
|
dxfeng
|
cbd33dbd3b
|
部门管理 列表 字段文本展示
|
2022-05-23 17:46:37 +08:00 |
|
Chengliang
|
f5561b8e7d
|
修改分页总数
|
2022-05-23 17:33:10 +08:00 |
|
dxfeng
|
39eebf62fc
|
!15 公司/分部 列表 字段文本展示
Merge pull request !15 from dxfeng/feature/dxf
|
2022-05-20 10:04:48 +00:00 |
|
dxfeng
|
4e391c5f7c
|
公司/分部 列表 字段文本展示
|
2022-05-20 18:03:27 +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
|
0cdfd1ed95
|
!13 公司/分部 编辑页面接口优化
Merge pull request !13 from dxfeng/feature/dxf
|
2022-05-20 08:32:04 +00:00 |
|
dxfeng
|
b4f79d380e
|
公司/分部 编辑页面接口优化
|
2022-05-20 16:30:56 +08:00 |
|
dxfeng
|
11cd25a501
|
!12 公司/分部 拓展表 拓展明细表 接口
Merge pull request !12 from dxfeng/feature/dxf
|
2022-05-20 07:54:57 +00:00 |
|
dxfeng
|
0d0e7eaefe
|
公司/分部 拓展表 拓展明细表 接口
|
2022-05-20 15:52:44 +08: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
|
e15168aa0a
|
公司/分部 列表展示列更新
|
2022-05-18 10:06:30 +08:00 |
|
dxfeng
|
21cddc290f
|
公司/分部 搜索、按钮、禁用/启用、删除接口
|
2022-05-18 09:59:34 +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
|
fae1bd776b
|
集团管理接口
|
2022-05-16 14:29:11 +08:00 |
|
dxfeng
|
c8bf7c1633
|
集团管理接口
|
2022-05-16 11:33:19 +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
|
23944db568
|
职级列表 职等信息展示
|
2022-05-12 14:27:10 +08:00 |
|
dxfeng
|
c445185f0d
|
统计BUG修复
|
2022-05-12 13:49:33 +08:00 |