160 Commits

Author SHA1 Message Date
杜建超
b2406efb21 fix 2020-10-30 14:11:22 +08:00
杜建超
ff4316d3c5 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-30 10:56:08 +08:00
wulin
8f38d222fa 修复问题 2020-10-30 10:55:37 +08:00
wulin
b2d5db2149 增加发起指定人员接口 2020-10-30 10:55:18 +08:00
杜建超
b1ef88c49e Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-30 10:50:00 +08:00
杜建超
d96c2d2cdb fix 2020-10-30 10:49:53 +08:00
wulin
3fec50fe81 增加指定发起指定人的任务 2020-10-30 10:47:37 +08:00
wulin
e5b21bde35 保存组接口增加对组管理员表lz_staff_role数据的插入 2020-10-30 09:54:58 +08:00
杜建超
53ab4efa73 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-30 09:27:43 +08:00
杜建超
d8a4bf513a fix 2020-10-30 09:27:38 +08:00
wulin
75e1c2ea2b lz_evaluation_start_staff增加department_id 2020-10-30 09:26:48 +08:00
wulin
9942f7a840 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-29 19:33:53 +08:00
wulin
f8fc1d16c3 获取详情保存详情增加评分详细记录 2020-10-29 19:33:47 +08:00
杜建超
2b6265cb97 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-29 15:23:03 +08:00
杜建超
5ab95765bc fix 2020-10-29 15:22:58 +08:00
wulin
b92dfdb974 保存节点的时候增加必备权限的复制 2020-10-29 15:07:16 +08:00
wulin
a1ea501c07 添加部分定义说明 2020-10-29 13:59:01 +08:00
杜建超
7f9e081707 fix 2020-10-29 11:44:12 +08:00
wulin
52db4335fb Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-28 18:57:46 +08:00
wulin
1db72815e7 绩效详情增加isDelete 2020-10-28 18:57:40 +08:00
杜建超
72c50b6272 fix 2020-10-28 18:02:53 +08:00
杜建超
5c46cd4a52 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-28 17:48:30 +08:00
杜建超
cfe61f1a58 fix 2020-10-28 17:48:24 +08:00
wulin
79a83dfa9e Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-28 17:32:22 +08:00
wulin
b5347a0aee 增加返回绩效详情时,返回当前指标权重之和 2020-10-28 17:32:08 +08:00
杜建超
7e4896db90 fix 2020-10-28 11:38:19 +08:00
wulin
f35c7c6df6 chart表添加描述字段 2020-10-28 11:24:19 +08:00
wulin
09bc21969b 绩效保存接口注释错误xiufu 2020-10-27 17:47:40 +08:00
wulin
15c82ace3a 增加保存绩效详情接口 2020-10-27 17:12:03 +08:00
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