完善考核周期判断

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("考核期尚未结束，无法打分");
+            }
         }
     }