From fcd11f88f5ad8780c46f0c69feb84194b01a9904 Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 1 Sep 2020 14:28:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A5=AD=E7=B8=BE=E6=94=B9=E6=88=90=E7=B8=BE?= =?UTF-8?q?=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lz/common/emun/WorkMsgTypeEnum.java | 18 +++++++++--------- .../app/controller/ResultRecordController.java | 2 +- .../app/impl/ResultDetailServiceImpl.java | 4 ++-- .../app/impl/ResultRecordServiceImpl.java | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java b/src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java index bee48831..6581a5c2 100644 --- a/src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java +++ b/src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java @@ -3,17 +3,17 @@ package com.lz.common.emun; import javax.security.auth.message.AuthStatus; /** - * 业绩通知相关type + * 绩效通知相关type */ public enum WorkMsgTypeEnum { - //业绩提交审核的通知（自己提交给领导，自己提交给人事，人事提交给老板） - SUBMIT(0, "业绩提交", "去审核", "# 业绩提交\n ## @的业绩已经提交"), - //业绩打回审核的通知 - REJECT(1, "业绩驳回", "去修改", "# 业绩驳回\n ## 你的业绩已经驳回"), - //业绩通过领导审核的通知，这一步提交到HR，提交的type - LEADER_PASS(2, "业绩已打分", "去提交给人事", "# 业绩已打分\n ## 你的业绩已经打分"), - //业绩通过人事，老板审核的最终审核通知 - PASS(3, "业绩通过", "去查看", "# 业绩通过\n ## 你的业绩已经通过"),; + //绩效提交审核的通知（自己提交给领导，自己提交给人事，人事提交给老板） + SUBMIT(0, "绩效提交", "去审核", "# 绩效提交\n ## @的绩效已经提交"), + //绩效打回审核的通知 + REJECT(1, "绩效驳回", "去修改", "# 绩效驳回\n ## 你的绩效已经驳回"), + //绩效通过领导审核的通知，这一步提交到HR，提交的type + LEADER_PASS(2, "绩效已打分", "去提交给人事", "# 绩效已打分\n ## 你的绩效已经打分"), + //绩效通过人事，老板审核的最终审核通知 + PASS(3, "绩效通过", "去查看", "# 绩效通过\n ## 你的绩效已经通过"),; int type; String title; String btnText; diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java index a6659737..16507b19 100644 --- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java +++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java @@ -212,7 +212,7 @@ public class ResultRecordController extends AbstractController { ResultDetailResp resp = new ResultDetailResp(); BeanUtils.copyProperties(resultDetail, resp); if (resultDetail.getType() == 1) { - resp.setCheckRange("业绩"); + resp.setCheckRange("绩效"); } else if (resultDetail.getType() == 2) { resp.setCheckRange("文化价值观"); } diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java index 8cd0c916..9c253977 100644 --- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java +++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java @@ -117,7 +117,7 @@ public class ResultDetailServiceImpl extends ServiceImpl resultDetails = resultDetailService.selectByRecordId(recordId); if (CollectionUtils.isEmpty(resultDetails)) { - return R.error("请先添加业绩。"); + return R.error("请先添加绩效。"); } double sum = resultDetails.stream().filter(p -> p.getType() == 1).mapToDouble(p -> NumberUtil.objToDoubleWithDefault(p.getCheckWeight(), 0d)).sum(); if (sum < 0.7) { - return R.error("recordId为[" + recordId + "]业绩权重之和必需等于0.7。"); + return R.error("recordId为[" + recordId + "]绩效权重之和必需等于0.7。"); } return R.ok(); }