wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

業績改成績效

Browse Source
This commit is contained in:
wulin 2020-09-01 14:28:02 +08:00
parent 67f0765bbe
commit fcd11f88f5
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/lz/common/emun/WorkMsgTypeEnum.java
View File

@ -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;

2
src/main/java/com/lz/modules/app/controller/ResultRecordController.java
View File

@ -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("文化价值观");
}

4
src/main/java/com/lz/modules/sys/service/app/impl/ResultDetailServiceImpl.java
View File

@ -117,7 +117,7 @@ public class ResultDetailServiceImpl extends ServiceImpl<ResultDetailMapper, Res
public ResultDetailResp getYeJi() {
ResultDetailResp result = new ResultDetailResp();
result.setCheckRange("业绩");
result.setCheckRange("绩效");
result.setCheckWeight(new BigDecimal(0.7));
result.setIsAdd(1);
result.setIsEdit(1);
@ -127,7 +127,7 @@ public class ResultDetailServiceImpl extends ServiceImpl<ResultDetailMapper, Res
public ResultDetailResp getYeJiKaoHe(BigDecimal acquireScore) {
ResultDetailResp respHeader = new ResultDetailResp();
respHeader.setKeyResult("业务考核结果");
respHeader.setKeyResult("绩效考核结果");
respHeader.setCheckWeight(new BigDecimal(0.7));
respHeader.setSuperScore("/");
respHeader.setAcquireScore(acquireScore);

4
src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
View File

@ -327,11 +327,11 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
public R checkApproval(Long recordId){
List<ResultDetail> 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();
}