kpi导入手动打分相关修改

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiManualScoreServiceImpl.java

@@ -106,13 +106,13 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl<KpiManualScoreDao
     @Override
     public PageData<KpiManualScoreResultDTO> listKpiManualScoreResultDTO(Map<String, Object> params) {
         String allDeptIds = "";
-        if (params.get("streetId") != "" && params.get("streetId") != null){
+        if (params.get("streetId") != "" && params.get("streetId") != null) {
             allDeptIds = params.get("streetId").toString(); //查询条件 街道
         }
-        if (params.get("communityId") != "" && params.get("communityId") != null){
+        if (params.get("communityId") != "" && params.get("communityId") != null) {
             allDeptIds = params.get("communityId").toString(); //查询条件 社区
         }
-        if (params.get("gridId") != "" && params.get("gridId") != null){
+        if (params.get("gridId") != "" && params.get("gridId") != null) {
             allDeptIds = params.get("gridId").toString(); //查询条件 网格
         }
         params.put("allDeptIds", allDeptIds);
@@ -432,17 +432,17 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl<KpiManualScoreDao
         }
         // 获取用户所有数据权限对应的部门
         List<DeptLevelAndLeaderDTO> deptList = getDeptListByDateScope(deptIdList);
-        // 用户导入的每条打分数据
-        KpiManualScoreTemplateExcel kpiManualScore;
-        // excel错误信息
-        List<ExcelError> checkExcel = Lists.newArrayList();
-        // 规则名
-        String ruleName = "";
         // 考核规则
         KpiRuleEntity kpiRuleEntity = null;
+        // 规则名
+        String ruleName = "";
         // 打分规则
         KpiManualScoreRuleEntity scoreRuleEntity = null;
+        // excel错误信息
+        List<ExcelError> checkExcel = Lists.newArrayList();
         int rowNum;
+        // 用户导入的每条打分数据
+        KpiManualScoreTemplateExcel kpiManualScore;
         for (int i = 0; i < recordList.size(); i++) {
             kpiManualScore = recordList.get(i);
             // 第几行
@@ -454,8 +454,10 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl<KpiManualScoreDao
             // 根据规则名，查询考核规则和打分规则
             if (!ruleName.equals(kpiManualScore.getRuleName())) {
                 ruleName = kpiManualScore.getRuleName();
+                // 根据规则名称获取考核规则
                 kpiRuleEntity = getRuleByName(ruleName);
                 if (null != kpiRuleEntity) {
+                    // 根据考核规则，获取关联的打分规则
                     scoreRuleEntity = kpiManualScoreRuleDao.selectById(kpiRuleEntity.getReferenceId());
                 }
             }
@@ -497,7 +499,7 @@ public class KpiManualScoreServiceImpl extends BaseServiceImpl<KpiManualScoreDao
             checkExcel.add(packageExcelError(rowNum, "考核起始日[" + startDate.toString() + "]错误"));
         }
         LocalDate endDate = LocalDateUtils.dateToLocalDate(kpiManualScore.getScoreEndDate());
-        if (endDate.compareTo(LocalDate.now()) < NumConstant.ZERO) {
+        if (endDate.compareTo(LocalDate.now()) > NumConstant.ZERO) {
             checkExcel.add(packageExcelError(rowNum, "不能针对未来的日期进行考核"));
         }
         int monthValue = startDate.getMonthValue();