From f213f7cf35d404f779b9d6722a6c1c36e7d743a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com>
Date: Fri, 18 Dec 2020 10:54:11 +0800
Subject: [PATCH] fix

---
 .../performance/controller/ResultTaskController.java     | 9 +++++++++
 .../performance/service/impl/ResultTaskServiceImpl.java  | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java b/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java
index e8eb4703..8de590a7 100644
--- a/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java
+++ b/src/main/java/com/lz/modules/performance/controller/ResultTaskController.java
@@ -1,7 +1,10 @@
 package com.lz.modules.performance.controller;
 
+import com.lz.common.utils.BigDecimalUtil;
 import com.lz.common.utils.PageUtils;
 import com.lz.common.utils.R;
+import com.lz.modules.performance.dao.ResultTaskMapper;
+import com.lz.modules.performance.dto.ResultTaskDto;
 import com.lz.modules.performance.dto.TaskProcessRecordDto;
 import com.lz.modules.performance.entity.TaskProcessRecord;
 import com.lz.modules.performance.req.ChangeTaskListReq;
@@ -15,9 +18,12 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @Author: djc
  * @Desc:
@@ -34,6 +40,8 @@ public class ResultTaskController extends AbstractController{
 
     @Autowired
     private TaskProcessRecordService taskProcessRecordService;
+    @Autowired
+    private ResultTaskMapper resultTaskMapper;
 
     @GetMapping("/result/taskDetail")
     @ApiOperation("获取绩效任务详情")
@@ -71,4 +79,5 @@ public class ResultTaskController extends AbstractController{
         Long userId = getUserId();
         return resultTaskService.deleteTask(taskId,userId);
     }
+
 }
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 27fccbc4..73ddd99d 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
@@ -202,9 +202,18 @@ public class ResultTaskServiceImpl extends ServiceImpl<ResultTaskMapper, ResultT
 		}
 		int size = resultTaskDtos.size();
 		Double rate = 0d;
+		int cout = 0;
 		for(ResultTaskDto dto:resultTaskDtos){
+			if(1 == dto.getProcessRate()){
+				cout++;
+				continue;
+			}
 			rate = BigDecimalUtil.add(rate,dto.getProcessRate());
 		}
+		size = size - cout;
+		if(size < 1){
+			return 1d;
+		}
 		double result = BigDecimalUtil.div(rate, size, 4);
 		return result;