Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• a51a6251f0 任务中途加人时不适用历史的组数据，使用最新的组数据 wulin 2020-12-18 20:59:32 +08:00
• 73889446fd 修改当考评组删除所有人时继续发起的逻辑，测试 wulin 2020-12-18 20:42:29 +08:00
• a4e336765d 优化 wulin 2020-12-18 17:53:54 +08:00
• 87452323de 优化 wulin 2020-12-18 17:47:33 +08:00
• b23c297749 修复找领导bug wulin 2020-12-18 17:30:27 +08:00
• 95a1e2c9c9 修改找领导逻辑，如果部门没有领导那么直接找上一级的 wulin 2020-12-18 17:01:32 +08:00
• bf00409bd9 提交测试 wulin 2020-12-18 16:48:29 +08:00
• 9972a921b3 解决评分转交时的错误 wulin 2020-12-18 16:13:37 +08:00
• 14035c148d Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 wulin 2020-12-18 15:24:55 +08:00
• 78d4119301 关于修改任务的问题 wulin 2020-12-18 15:24:50 +08:00
• 721688c620 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 杜建超 2020-12-18 14:51:49 +08:00
• 62f310d90f fix 杜建超 2020-12-18 14:51:44 +08:00
• 6d4a89d665 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 wulin 2020-12-18 14:12:56 +08:00
• c431f82080 修改测试 wulin 2020-12-18 14:12:52 +08:00
• 72ad2910be Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 杜建超 2020-12-18 14:02:07 +08:00
• 6f36b84b2e fix 杜建超 2020-12-18 14:02:02 +08:00
• 87885eca0c 增加对自定义异常炮火 wulin 2020-12-18 11:58:19 +08:00
• 5948f4eee5 指定目标逻辑修改 wulin 2020-12-18 11:22:18 +08:00
• e8c604b22a Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 wulin 2020-12-18 11:16:04 +08:00
• 6d94fd36f7 修改判断条件问题 wulin 2020-12-18 11:15:58 +08:00
• 6fe468028f qjuw quyixiao 2020-12-18 11:10:38 +08:00
• 4cf089e3f0 提交修改 quyixiao 2020-12-18 11:10:17 +08:00
• cd2c1d08f2 提交修改 quyixiao 2020-12-18 11:10:00 +08:00
• a7c00a6512 fix 杜建超 2020-12-18 11:09:55 +08:00
• be0fc013a1 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 wulin 2020-12-18 11:00:46 +08:00
• 2b6db8e1b0 非本人修改任务抛异常 wulin 2020-12-18 11:00:38 +08:00
• b151f8a9ec Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 杜建超 2020-12-18 10:54:16 +08:00
• f213f7cf35 fix 杜建超 2020-12-18 10:54:11 +08:00
• 2281baa016 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 wulin 2020-12-18 10:53:49 +08:00
• de76f1bb12 提交修改 wulin 2020-12-18 10:53:44 +08:00
• 5979e51b26 提交修改 quyixiao 2020-12-18 10:45:05 +08:00
• fb76d5f9de 提交修改 quyixiao 2020-12-18 10:44:03 +08:00
• 5bffca00ef 提交修改 quyixiao 2020-12-18 10:39:09 +08:00
• 661f9c6d1e 提交修改 quyixiao 2020-12-18 10:38:56 +08:00
• 367bdbbec5 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 杜建超 2020-12-17 18:59:49 +08:00
• 0b4acc40b7 fix 杜建超 2020-12-17 18:59:43 +08:00
• 0e4f141d49 提交修改 wulin 2020-12-17 18:54:49 +08:00
• a7419791b7 测试数据 wulin 2020-12-17 17:43:28 +08:00
• 3f11ba6c20 评分表增加isEdit wulin 2020-12-17 17:42:03 +08:00
• a91eee765a 修复保存绩效时报错 wulin 2020-12-17 15:46:47 +08:00
• 941759ac35 修复日志错误 wulin 2020-12-17 15:41:47 +08:00
• 6af906a279 保存绩效增加日志 wulin 2020-12-17 15:36:18 +08:00
• f8ff21cf14 一键催办使用线程发送 wulin 2020-12-17 14:42:57 +08:00
• caa3c109d8 增加个人计算总分的公司 wulin 2020-12-17 11:22:27 +08:00
• 003642096d 修复获取record的bug wulin 2020-12-17 10:34:59 +08:00
• cc37255a5b 修复，优化 wulin 2020-12-17 10:31:59 +08:00
• dc8a5f406f 修改一键催办逻辑 wulin 2020-12-17 10:24:32 +08:00
• a6cd4a34bd 返回字段错误 wulin 2020-12-16 18:51:12 +08:00
• f19a65ba74 增加日志 wulin 2020-12-16 18:46:45 +08:00
• cd086b5529 修修复管理员一键催办bug wulin 2020-12-16 18:34:54 +08:00
• ef28a6dba1 一键催收增加全部部门 wulin 2020-12-16 18:22:16 +08:00
• bdc3cfce1d 对空值的判断 wulin 2020-12-16 18:10:02 +08:00
• 46e3a99147 k-value参数接受get参数 wulin 2020-12-16 18:03:12 +08:00
• ff77b0d357 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 wulin 2020-12-16 17:54:42 +08:00
• 6d717e067f 添加一键催办 wulin 2020-12-16 17:54:38 +08:00
• 377941ac63 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 杜建超 2020-12-16 16:43:21 +08:00
• 245649340f fix 杜建超 2020-12-16 16:43:04 +08:00
• 3091d3516c Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 wulin 2020-12-16 16:39:09 +08:00
• 515b8a61d1 绩效管理人员增加一键催办功能 wulin 2020-12-16 16:39:04 +08:00
• ecc289d9ac 提交修改 quyixiao 2020-12-16 16:16:07 +08:00
• d43657e685 提交修改 quyixiao 2020-12-16 16:15:44 +08:00
• fe6bbe0955 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 杜建超 2020-12-16 15:57:52 +08:00
• dd4668b1b1 fix 杜建超 2020-12-16 15:57:47 +08:00
• 367bd1f366 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 wulin 2020-12-16 14:16:51 +08:00
• 695393bcbf 修复同步试用期人眼bug wulin 2020-12-16 14:16:44 +08:00
• ddc7cbaab8 提交修改 quyixiao 2020-12-16 11:21:57 +08:00
• c9779f38ea sel quyixiao 2020-12-16 11:10:03 +08:00
• d931366345 提交修改 quyixiao 2020-12-16 11:09:39 +08:00
• 3c43aef7cc 重新提交 wulin 2020-12-15 17:22:07 +08:00
• 9b0983f7c0 record只更新评分结果 wulin 2020-12-15 17:16:48 +08:00
• 0c9a145ead Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 wulin 2020-12-15 17:04:06 +08:00
• 72ada786ad 保存绩效详情不更新record表 wulin 2020-12-15 17:04:01 +08:00
• b25a590462 提交修改 quyixiao 2020-12-15 16:50:38 +08:00
• 72f9918bab 提交候tgit quyixiao 2020-12-15 16:31:58 +08:00
• b9227cf157 提交修改 quyixiao 2020-12-15 16:31:27 +08:00
• 019b736452 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 杜建超 2020-12-15 14:49:17 +08:00
• 785ffda67f fix 杜建超 2020-12-15 14:49:12 +08:00
• 11de9e828d Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 wulin 2020-12-15 14:44:27 +08:00
• 6638f8fb8d 修改更新指标记录数据 wulin 2020-12-15 14:44:22 +08:00
• 1adcd6f556 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 杜建超 2020-12-15 14:36:10 +08:00
• 5932ca7683 fix 杜建超 2020-12-15 14:36:05 +08:00
• 498a97288d Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 wulin 2020-12-15 14:34:51 +08:00
• 112cf8622c 皮论任务时增加指标id detailId，前端打开链接直接调转到detailId wulin 2020-12-15 14:34:41 +08:00
• 370ca2a9b4 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 杜建超 2020-12-15 14:31:21 +08:00
• 051a5b231f fix 杜建超 2020-12-15 14:31:16 +08:00
• ac732bc9bd 任务评论通知@的替换的问题 wulin 2020-12-15 14:26:30 +08:00
• b4d8a49e2f 测试bug wulin 2020-12-15 14:14:04 +08:00
• c9735ec966 去掉部分注释 wulin 2020-12-15 14:07:21 +08:00
• 71617a486c 修复修改权重时无法显示变更及记录 wulin 2020-12-15 14:04:52 +08:00
• 56b0188dd9 生成跟新记录时防止事务的影响 wulin 2020-12-15 13:55:15 +08:00
• ecf2c05c87 Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 wulin 2020-12-15 12:10:27 +08:00
• 43c590c94f 修复保存detail的staffid错误 wulin 2020-12-15 12:10:22 +08:00
• 92520e8bd8 fix 杜建超 2020-12-15 11:55:46 +08:00
• 9b8c07648e fix 杜建超 2020-12-15 10:42:21 +08:00
• 1563b63aa8 fix 杜建超 2020-12-14 18:48:18 +08:00
• 91fe46fdcc fix 杜建超 2020-12-14 18:38:48 +08:00
• b93f66c56c Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0 杜建超 2020-12-14 18:22:45 +08:00
• 8ec1508700 fix 杜建超 2020-12-14 18:22:41 +08:00
• cd82d98116 去掉自己评论自己任务时推送通知的问题 wulin 2020-12-14 18:21:24 +08:00
• acb28649e5 提交修改 quyixiao 2020-12-14 15:14:15 +08:00