From 6a05d8b568c3459cf4187de93a04c7b0edc1e98b Mon Sep 17 00:00:00 2001
From: DirectionOfMind <3182967682@qq.com>
Date: Tue, 26 Jan 2021 19:27:07 +0800
Subject: [PATCH] fix

---
 .../service/impl/ResultTaskServiceImpl.java   | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java
index 8f941b31..2e73f595 100644
--- a/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java
+++ b/src/main/java/com/lz/modules/performance/service/impl/ResultTaskServiceImpl.java
@@ -186,8 +186,12 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
 				log.info("任务暂无变化，不做修改");
 			}
 			resultTask.setOrderBy(req.getOrderBy());
-			resultTask.setName(req.getName());
-			resultTask.setProcessRate(req.getProcessRate());
+			if(StringUtil.isNotBlank(req.getName())){
+				resultTask.setName(req.getName());
+			}
+			if(req.getProcessRate()!=null){
+				resultTask.setProcessRate(req.getProcessRate());
+			}
 			resultTaskMapper.updateCoverResultTaskById(resultTask);
 
 		}
@@ -212,7 +216,9 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
 		int size = resultTaskDtos.size();
 		Double rate = 0d;
 		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);
 		return result;
@@ -232,11 +238,11 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
 		//判断修改了名称或进度
 		int i = 0;
 		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);
 			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);
 			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());
 		}
 		String rate = second.getRate();
-		BigDecimal rateRes = BigDecimal.ZERO;
+		BigDecimal rateRes;
 		if(StringUtil.isNotBlank(rate)){
-			String trim = rate.trim();
-			boolean contains = trim.contains("%");
+			rate = rate.trim();
+			boolean contains = rate.contains("%");
+			if(contains){
+				rate = rate.replaceAll("%", "");
+			}
 			if(contains || new BigDecimal(rate).compareTo(BigDecimal.ONE)>-1){
 				rateRes = new BigDecimal(rate).multiply(BigDecimal.valueOf(0.01));
+			}else {
+				rateRes = new BigDecimal(rate);
 			}
 
 			resultUpdateTaskReq.setProcessRate(rateRes);
@@ -368,4 +379,5 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
 		return this.saveOrUpdateResultTask(resultUpdateTaskReq,user.getUserId());
 	}
 
+
 }