From 4e44349c7e895bd41ef1ff34a1f58109712ae326 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Fri, 13 Nov 2020 18:02:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=91=E8=B5=B7?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E8=87=AA=E5=AE=9A=E4=B9=89=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lz/modules/flow/service/impl/FlowStartServiceImpl.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java
index b57d9cee..daa259f7 100644
--- a/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java
+++ b/src/main/java/com/lz/modules/flow/service/impl/FlowStartServiceImpl.java
@@ -189,8 +189,8 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
 				log.info("未设置有效考核结束月份");
 				return R.error("未设置有效考核结束月份");
 			}
-			String endDate = sdf.format(flowStart.getStartTime());
-			flowStart.setName(startDate + "-" + endDate + "绩效考核");
+			String endDate = sdf.format(flowStart.getEndTime());
+			flowStart.setName(startDate + "至" + endDate + "绩效考核");
 		}else{
 			flowStart.setName(startDate + "绩效考核");
 		}

From 4cb8605b15f658ca62d93bf9e6621822ca540159 Mon Sep 17 00:00:00 2001
From: wulin <wulin@linzikg.com>
Date: Fri, 13 Nov 2020 19:39:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B2=BE=E5=BA=A6=E4=B8=BA=E5=9B=9B=E8=88=8D?=
 =?UTF-8?q?=E4=BA=94=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lz/modules/app/controller/ResultRecordController.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
index 40e6aa0d..37c4effc 100644
--- a/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
+++ b/src/main/java/com/lz/modules/app/controller/ResultRecordController.java
@@ -417,7 +417,7 @@ public class ResultRecordController extends AbstractController {
                     resultScore.setWeight(record.getWeight());
                 }else{
                     //多人的时候权重平分
-                    resultScore.setWeight(record.getWeight().divide(BigDecimal.valueOf(staffs1.size()), RoundingMode.CEILING));
+                    resultScore.setWeight(record.getWeight().divide(BigDecimal.valueOf(staffs1.size()), RoundingMode.HALF_UP));
                 }
 
                 scoreDtos.add(resultScore);