From 72df416cf792dc6e10b169b0f7a044604f8a88d6 Mon Sep 17 00:00:00 2001
From: yujintao <yujintaodotcn@foxmail.com>
Date: Tue, 17 Dec 2019 10:48:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=80=83=E6=A0=B8=E5=91=A8?=
 =?UTF-8?q?=E6=9C=9F=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/service/impl/KpiManualScoreServiceImpl.java  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java
index 29fdfd449..d9dce0d7a 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java
@@ -150,11 +150,12 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl<KpiManualScoreDao
     private void checkMonthAndCycle(String kpiCycle, YearMonth scoreStartDateMonth) {
 
         YearMonth now = YearMonth.now();
-        if (now.compareTo(scoreStartDateMonth) <= NumConstant.ZERO) {
-            throw new RenException("只能针对过去的月份进行考核打分");
+        if (now.compareTo(scoreStartDateMonth) < NumConstant.ZERO) {
+            throw new RenException("不能针对未来的月份进行考核打分");
         }
 
         int monthValue = scoreStartDateMonth.getMonthValue();
+        LocalDate localDate = LocalDate.now();
 
         // 季度打分
         if (kpiCycle.equals(KpiCycleEnum.KPI_CYCLE_QUARTER.getValue())) {
@@ -162,10 +163,16 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl<KpiManualScoreDao
                     && monthValue != NumConstant.SEVEN && monthValue != NumConstant.TEN) {
                 throw new RenException("季度打分只能在1/4/7/10月份进行");
             }
+            if (localDate.compareTo(scoreStartDateMonth.plusMonths(NumConstant.TWO).atEndOfMonth()) <= NumConstant.ZERO) {
+                throw new RenException("考核期尚未结束，无法打分");
+            }
         } else if (kpiCycle.equals(KpiCycleEnum.KPI_CYCLE_YEAR.getValue())) {
             if (monthValue != NumConstant.ONE) {
                 throw new RenException("年度打分只能在1月份进行");
             }
+            if (localDate.compareTo(scoreStartDateMonth.plusMonths(NumConstant.ELEVEN).atEndOfMonth()) <= NumConstant.ZERO) {
+                throw new RenException("考核期尚未结束，无法打分");
+            }
         }
     }