1489 Commits

Author SHA1 Message Date
wulin
3e12e8f8a3 修复 2020-10-30 14:14:06 +08:00
杜建超
0d35844250 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-30 14:13:45 +08:00
wulin
7a2950c2b8 修复发起bug 2020-10-30 14:13:36 +08:00
杜建超
abd2eaa80c Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-30 14:11:25 +08:00
杜建超
b2406efb21 fix 2020-10-30 14:11:22 +08:00
wulin
c9772211d1 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-30 11:54:06 +08:00
wulin
60017b524e 解决bug 2020-10-30 11:54:00 +08:00
quyixiao
428fb0fe40 提交修改 2020-10-30 11:49:46 +08:00
quyixiao
5288a78da0 提交修改 2020-10-30 11:49:26 +08:00
wulin
c88eb0a9b3 发起绩效时增加搜索绩效管理员 2020-10-30 11:30:20 +08:00
wulin
ee7c9ebc4f 修复问题 2020-10-30 11:12:34 +08:00
wulin
81aa664cb3 完善指定考核人员信息 2020-10-30 11:06:05 +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
quyixiao
74c61f4b2d 提交修改 2020-10-29 15:38:23 +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
杜建超
8dd1c6591a Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-29 11:50:04 +08:00
杜建超
b891041631 fix 2020-10-29 11:49:59 +08:00
杜建超
7f9e081707 fix 2020-10-29 11:44:12 +08:00
wulin
118517d527 保存绩效详情增加对指标权重之和不能超过维度权重之和 2020-10-29 09:58:34 +08:00
wulin
b6d5f33cc4 修复制定目标是无法保存的问题 2020-10-29 09:50:18 +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
c16808c6af 解决bug 2020-10-28 17:39:17 +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
杜建超
538dab9114 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-28 14:55:04 +08:00
杜建超
a350640b39 fix 2020-10-28 14:55:00 +08:00
quyixiao
706b097dda 提交修改 2020-10-28 14:40:01 +08:00
quyixiao
e0f0a3cc52 提交修改 2020-10-28 14:39:34 +08:00
杜建超
7e4896db90 fix 2020-10-28 11:38:19 +08:00
杜建超
3c3b3707d5 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-28 11:25:07 +08:00
杜建超
a17ba44ad9 fix 2020-10-28 11:25:02 +08:00
wulin
8587ce74fe Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 2020-10-28 11:24:24 +08:00