From a7c00a6512c639a1d8472565e027c2b2c50c018a 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 11:09:55 +0800
Subject: [PATCH 1/2] fix

---
 .../performance/service/impl/ResultTaskServiceImpl.java  | 9 ---------
 1 file changed, 9 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 73ddd99d..27fccbc4 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,18 +202,9 @@ 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;
 

From cd2c1d08f24c4e32b6d4f2bef4d17461f85958c0 Mon Sep 17 00:00:00 2001
From: quyixiao <2621048238@qq.com>
Date: Fri, 18 Dec 2020 11:10:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/sys/service/app/impl/ResultRecordServiceImpl.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
index c5626b7e..8641c333 100644
--- a/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
+++ b/src/main/java/com/lz/modules/sys/service/app/impl/ResultRecordServiceImpl.java
@@ -1074,7 +1074,8 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
             }
             String comment = StringUtil.isNotBlank(resultComment.getComment()) ? resultComment.getComment() + "_" : "";
             String optDesc = StringUtil.isNotBlank(resultComment.getOptDesc()) ? resultComment.getOptDesc() + "_" : "";
-            resultComment.setComment(comment + approvalDto.getComment());
+            String newComment = StringUtil.isNotBlank(approvalDto.getComment()) ? approvalDto.getComment() : "";
+            resultComment.setComment(comment + newComment);
             resultComment.setStaffName(staffEntity.getName());
             resultComment.setStaffId(staffEntity.getId());
             resultComment.setRecordId(approvalDto.getResultRecordId());