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

fix

Browse Source
This commit is contained in:
DirectionOfMind 2021-01-26 19:27:07 +08:00
parent 55199060d9
commit 6a05d8b568
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java
View File

@ -186,8 +186,12 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
log.info("任务暂无变化，不做修改"); log.info("任务暂无变化，不做修改");
} }
resultTask.setOrderBy(req.getOrderBy()); resultTask.setOrderBy(req.getOrderBy());
resultTask.setName(req.getName()); if(StringUtil.isNotBlank(req.getName())){
resultTask.setProcessRate(req.getProcessRate()); resultTask.setName(req.getName());
}
if(req.getProcessRate()!=null){
resultTask.setProcessRate(req.getProcessRate());
}
resultTaskMapper.updateCoverResultTaskById(resultTask); resultTaskMapper.updateCoverResultTaskById(resultTask);
} }
@ -212,7 +216,9 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
int size = resultTaskDtos.size(); int size = resultTaskDtos.size();
Double rate = 0d; Double rate = 0d;
for(ResultTaskDto dto:resultTaskDtos){ for(ResultTaskDto dto:resultTaskDtos){
rate = BigDecimalUtil.add(rate,dto.getProcessRate()); if(dto.getProcessRate()!=null){
rate = BigDecimalUtil.add(rate,dto.getProcessRate());
}
} }
double result = BigDecimalUtil.div(rate, size, 4); double result = BigDecimalUtil.div(rate, size, 4);
return result; return result;
@ -232,11 +238,11 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
//判断修改了名称或进度 //判断修改了名称或进度
int i = 0; int i = 0;
String lebel = "key Results名称：" + beforeResultTask.getName(); String lebel = "key Results名称：" + beforeResultTask.getName();
if(!beforeResultTask.getName().equals(req.getName())) { if(StringUtil.isNotBlank(req.getName()) && !req.getName().equals(beforeResultTask.getName())) {
i|= (0x00000001<<0); i|= (0x00000001<<0);
lebel = lebel + " 改为 " + req.getName() + "\n"; lebel = lebel + " 改为 " + req.getName() + "\n";
} }
if(BigDecimalUtil.compareTo(beforeResultTask.getProcessRate(),req.getProcessRate())!=0){ if(req.getProcessRate()!=null && BigDecimalUtil.compareTo(beforeResultTask.getProcessRate(),req.getProcessRate())!=0){
i|= (0x00000001<<1); i|= (0x00000001<<1);
lebel = lebel + "将进度：" +BigDecimalUtil.mul(beforeResultTask.getProcessRate(),BigDecimal.valueOf(100)).setScale(2)+ "%" + " 更新为 " + BigDecimalUtil.mul(req.getProcessRate(),BigDecimal.valueOf(100)).setScale(2)+ "%"; lebel = lebel + "将进度：" +BigDecimalUtil.mul(beforeResultTask.getProcessRate(),BigDecimal.valueOf(100)).setScale(2)+ "%" + " 更新为 " + BigDecimalUtil.mul(req.getProcessRate(),BigDecimal.valueOf(100)).setScale(2)+ "%";
} }
@ -354,12 +360,17 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
resultUpdateTaskReq.setDetailId(resultTask.getDetailId()); resultUpdateTaskReq.setDetailId(resultTask.getDetailId());
} }
String rate = second.getRate(); String rate = second.getRate();
BigDecimal rateRes = BigDecimal.ZERO; BigDecimal rateRes;
if(StringUtil.isNotBlank(rate)){ if(StringUtil.isNotBlank(rate)){
String trim = rate.trim(); rate = rate.trim();
boolean contains = trim.contains("%"); boolean contains = rate.contains("%");
if(contains){
rate = rate.replaceAll("%", "");
}
if(contains || new BigDecimal(rate).compareTo(BigDecimal.ONE)>-1){ if(contains || new BigDecimal(rate).compareTo(BigDecimal.ONE)>-1){
rateRes = new BigDecimal(rate).multiply(BigDecimal.valueOf(0.01)); rateRes = new BigDecimal(rate).multiply(BigDecimal.valueOf(0.01));
}else {
rateRes = new BigDecimal(rate);
} }
resultUpdateTaskReq.setProcessRate(rateRes); resultUpdateTaskReq.setProcessRate(rateRes);
@ -368,4 +379,5 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
return this.saveOrUpdateResultTask(resultUpdateTaskReq,user.getUserId()); return this.saveOrUpdateResultTask(resultUpdateTaskReq,user.getUserId());
} }
} }