年表、月表收尾

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcoll/impl/FactIndexCollectServiceImpl.java

@@ -446,16 +446,13 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
             orgIds[j] = deptScore.getKey();
             j++;
             for ( int i = 0; i < deptScore.getValue().size(); i++){
-                if (NumConstant.ONE_STR.equals(deptScore.getValue().get(i).getIsTotal())){
-                    // 是总分   总指数 = IS_TOTAL = 1
+                // 区直街道的总分 就是 治理能力
                 monthlyFormDTO.setIndexTotal(deptScore.getValue().get(i).getScore());
-                } else {
-                    // 赋值 党建能力、治理能力、服务能力
+                // 赋值 治理能力
                 monthlyFormDTO = this.setValueAblityMonthlyFor(deptScore.getValue().get(i).getIndexCode(),
                         deptScore.getValue().get(i).getScore(),
                         monthlyFormDTO);
             }
-            }
             // 查询网格的 上级组织id 和 组织名称
             ScreenCustomerDeptEntity parentDeptInfo = screenCustomerDeptDao.selectParentDeptInfo(customerId, deptScore.getKey());
             if (null == parentDeptInfo){
@@ -775,6 +772,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
             deptScore2.setIsTotal(NumConstant.ZERO_STR);
             deptScore2.setScore(new BigDecimal(NumConstant.ZERO));
             deptScore2.setIndexCode(IndexCodeEnum.ZHI_LI_NENG_LI.getCode());
+            deptScore2.setDelFlag(NumConstant.ZERO_STR);
             insertIndexDeptScore.add(deptScore2);
         }
         deptScoreDao.batchInsertDeptScoreData(insertIndexDeptScore, customerId);
@@ -784,6 +782,8 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
         String[] dateArr = yearOrMonth(monthId);
         List<AgencyScoreEntity> insertIndexAgencyScore = new ArrayList<>();
         for (ScreenCustomerAgencyEntity agencyDTO : mismatchAgencyList){
+            if ("community".equals(agencyDTO.getLevel()) || "street".equals(agencyDTO.getLevel())
+             || "district".equals(agencyDTO.getLevel())){
                 AgencyScoreEntity agencyScore1 = new AgencyScoreEntity();
                 // 赋默认值 - 党建能力指数
                 agencyScore1.setAgencyId(agencyDTO.getAgencyId());
@@ -838,7 +838,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
                     agencyScore2.setDataType("district");
                     agencyScore3.setDataType("district");
                     insertIndexAgencyScore.add(agencyScore4);
-            } else if ("street".equals(agencyDTO.getLevel())){
+                } else if ("street".equals(agencyDTO.getLevel()) || "district".equals(agencyDTO.getLevel())){
                     AgencyScoreEntity agencyScore4 = new AgencyScoreEntity();
                     // 赋默认值 - 街道相关
                     agencyScore4.setAgencyId(agencyDTO.getAgencyId());
@@ -861,6 +861,7 @@ public class FactIndexCollectServiceImpl implements FactIndexCollectService {
                 insertIndexAgencyScore.add(agencyScore2);
                 insertIndexAgencyScore.add(agencyScore3);
             }
+        }
         agencyScoreDaol.batchInsertAgencyScoreData(insertIndexAgencyScore, customerId);
     }
 

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/DeptScoreDao.xml

@@ -77,7 +77,7 @@
             #{item.isTotal},
             #{item.score},
             #{item.indexCode},
-            0,
+            #{item.delFlag},
             0,
             'APP_USER',
             now(),