wulin
|
64efab57b9
|
Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0
|
2020-10-27 16:08:38 +08:00 |
|
wulin
|
0d33e10774
|
添加获取绩效详情
|
2020-10-27 16:08:33 +08:00 |
|
杜建超
|
fcf9ec460b
|
Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0
|
2020-10-27 15:56:07 +08:00 |
|
杜建超
|
4f3a52596f
|
fix
|
2020-10-27 15:56:03 +08:00 |
|
quyixiao
|
184cd5d8e6
|
rjuq whnt
|
2020-10-27 15:35:39 +08:00 |
|
wulin
|
c8c492e9ad
|
解决冲突
|
2020-10-27 14:55:46 +08:00 |
|
wulin
|
b95bb856d1
|
发起考核时返回发起对象
|
2020-10-27 14:54:58 +08:00 |
|
quyixiao
|
162c01b73b
|
提交修改
|
2020-10-27 14:34:37 +08:00 |
|
quyixiao
|
4a27bc2692
|
提交修改
|
2020-10-27 14:34:10 +08:00 |
|
wulin
|
ede0acde37
|
引用初始化lz_flow_record表
|
2020-10-27 14:05:47 +08:00 |
|
wulin
|
31eec17e0e
|
Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0
|
2020-10-27 12:05:23 +08:00 |
|
quyixiao
|
d8af83e0fb
|
提交修改
|
2020-10-27 11:48:32 +08:00 |
|
wulin
|
4d33a7fe35
|
Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0
|
2020-10-27 11:13:19 +08:00 |
|
wulin
|
daad5e41f6
|
修改发起考核接口，
|
2020-10-27 11:13:13 +08:00 |
|
quyixiao
|
41e6a8a7c7
|
提交修改
|
2020-10-26 18:52:53 +08:00 |
|
quyixiao
|
1217c67b32
|
提交儿童睡袋 t
|
2020-10-26 18:52:11 +08:00 |
|
wulin
|
8ade53dfb1
|
Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0
|
2020-10-26 16:29:19 +08:00 |
|
wulin
|
86fc82ae8c
|
修复当人员在多个部门时，获取部门几级领导异常。目前搜索第一个为准
|
2020-10-26 16:29:14 +08:00 |
|
杜建超
|
2f519074d3
|
fix
|
2020-10-26 16:19:52 +08:00 |
|
杜建超
|
4681cb93fb
|
fix
|
2020-10-26 16:19:25 +08:00 |
|
quyixiao
|
d90ea0b15a
|
提交修改
|
2020-10-26 16:01:20 +08:00 |
|
quyixiao
|
7044bebf95
|
提交修改
|
2020-10-26 15:54:51 +08:00 |
|
quyixiao
|
4aa5aa4dd4
|
提交修改
|
2020-10-26 15:37:58 +08:00 |
|
quyixiao
|
fb945d20a9
|
提交修改
|
2020-10-26 15:36:20 +08:00 |
|
wulin
|
5c896280de
|
flowchart添加字段
|
2020-10-26 15:35:39 +08:00 |
|
wulin
|
2dbc72645e
|
一些操作放到service里面，并添加手动事务回滚操作
|
2020-10-26 15:03:58 +08:00 |
|
wulin
|
023876e362
|
修复发起考核bug
|
2020-10-26 14:08:21 +08:00 |
|
wulin
|
dd845a1ac7
|
Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0
|
2020-10-26 11:56:08 +08:00 |
|
wulin
|
ad3eefc453
|
lz_flow_approval_role修改roleId为String
|
2020-10-26 11:56:04 +08:00 |
|
quyixiao
|
d1957ecad6
|
提交修改
|
2020-10-26 11:51:05 +08:00 |
|
wulin
|
3f4a1612ee
|
修复问题
|
2020-10-25 23:46:29 +08:00 |
|
wulin
|
944846d7ec
|
发起考核功能基本完成
|
2020-10-25 22:21:22 +08:00 |
|
wulin
|
1fe86fda4c
|
Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0
|
2020-10-23 18:12:16 +08:00 |
|
wulin
|
474adeb112
|
改的多，就不愿意描述
|
2020-10-23 18:12:10 +08:00 |
|
杜建超
|
aa7dfccc0c
|
fix
|
2020-10-23 17:55:59 +08:00 |
|
wulin
|
838e751775
|
获取组模板列表是无法返回登记id
|
2020-10-22 17:19:39 +08:00 |
|
wulin
|
59a8dae138
|
Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0
|
2020-10-22 16:04:41 +08:00 |
|
wulin
|
6b6bac4899
|
获取节点和单个获取节点信息接口合并
|
2020-10-22 16:04:36 +08:00 |
|
杜建超
|
184b530481
|
Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0
|
2020-10-22 15:47:00 +08:00 |
|
杜建超
|
6d1f1f1f42
|
fix
|
2020-10-22 15:46:54 +08:00 |
|
wulin
|
cd93891f21
|
获取
|
2020-10-22 15:06:20 +08:00 |
|
wulin
|
91fa248be4
|
增加param
|
2020-10-22 09:51:51 +08:00 |
|
wulin
|
c5b51dd21e
|
Fix
|
2020-10-21 20:53:42 +08:00 |
|
wulin
|
b9397343c9
|
解决冲突
|
2020-10-21 20:51:12 +08:00 |
|
wulin
|
cadab4891a
|
新增保存戒掉小流程列表，修改保存考核指标为列表
|
2020-10-21 20:50:22 +08:00 |
|
杜建超
|
ed4f1e3736
|
fix
|
2020-10-21 18:12:15 +08:00 |
|
杜建超
|
35afe09d7a
|
fix
|
2020-10-21 17:05:43 +08:00 |
|
杜建超
|
6e73c4da7d
|
fix
|
2020-10-21 17:04:56 +08:00 |
|
wulin
|
ddf11e0134
|
流程小节点增加权重
"
|
2020-10-21 16:23:07 +08:00 |
|
wulin
|
4ea78046df
|
Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0
|
2020-10-21 14:31:03 +08:00 |
|