【治理排行-打分项调整】-王公峰

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiCommunityBuildingDTO.java

@@ -24,7 +24,7 @@ import java.util.Date;
 
 
 /**
- * 网格建设打分表 
+ * 网格建设打分表
  *
  * @author elink elink@elink-cn.com
  * @since v1.0.0 2020-06-15
@@ -60,17 +60,17 @@ public class KpiCommunityBuildingDTO implements Serializable {
 	private String monthYear;
 
     /**
-     * 民主协商机制
+     * 民主协商自治（过去叫“民主协商机制”）
      */
 	private String democraticConsultationMechanism;
 
     /**
-     * 居民公约制度
+     * 基层政权建设（过去叫“居民公约制度”）
      */
 	private String residentConventionSystem;
 
     /**
-     * 网格协商案例
+     * 加强和创新社区治理（过去叫“网格协商案例”）
      */
 	private String gridNegotiationCase;
 
@@ -124,4 +124,4 @@ public class KpiCommunityBuildingDTO implements Serializable {
      */
 	private String delFlag;
 
-}
+}

esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/excel/KpiCommunityBuildingExcel.java

@@ -21,7 +21,7 @@ import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
 
 /**
- * 网格建设打分表 
+ * 网格建设打分表
  *
  * @author elink elink@elink-cn.com
  * @since v1.0.0 2020-06-15
@@ -44,13 +44,13 @@ public class KpiCommunityBuildingExcel {
     @Excel(name = "年月")
     private String monthYear;
 
-    @Excel(name = "民主协商机制得分")
+    @Excel(name = "民主协商自治得分")
     private String democraticConsultationMechanism;
 
-    @Excel(name = "居民公约制度得分")
+    @Excel(name = "基层政权建设得分")
     private String residentConventionSystem;
 
-    @Excel(name = "网格协商案例得分")
+    @Excel(name = "加强和创新社区治理得分")
     private String gridNegotiationCase;
 
 //    @Excel(name = "上级部门id")
@@ -84,4 +84,4 @@ public class KpiCommunityBuildingExcel {
 //    private String delFlag;
 
 
-}
+}

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

@@ -61,7 +61,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 网格建设打分表 
+ * 网格建设打分表
  *
  * @author elink elink@elink-cn.com
  * @since v1.0.0 2020-06-15
@@ -313,27 +313,27 @@ public class KpiCommunityBuildingServiceImpl extends BaseServiceImpl<KpiCommunit
      * @return
      */
     private Boolean checkScoreCell(KpiCommunityBuildingExcel kpiCommunityBuildingExcel){
-        // 民主协商机制分数（3分）
+        // 民主协商自治分数（3分）
         String democraticConsultationMechanism = kpiCommunityBuildingExcel.getDemocraticConsultationMechanism();
         if(ExcelUtils.checkNumber(democraticConsultationMechanism)){
             return true;
         }
         Double democraticConsultationMechanismDouble = Double.parseDouble(democraticConsultationMechanism);
-        // 网格协商案例分数（4分）
+        // 加强和创新社区治理分数（5分）
         String gridNegotiationCase = kpiCommunityBuildingExcel.getGridNegotiationCase();
         if(ExcelUtils.checkNumber(gridNegotiationCase)){
             return true;
         }
         Double gridNegotiationCaseDouble = Double.parseDouble(gridNegotiationCase);
-        // 居民公约制度分数（3分）
+        // 基层政权建设分数（2分）
         String residentConventionSystem = kpiCommunityBuildingExcel.getResidentConventionSystem();
         if(ExcelUtils.checkNumber(residentConventionSystem)){
             return true;
         }
         Double residentConventionSystemDouble = Double.parseDouble(residentConventionSystem);
         if(democraticConsultationMechanismDouble < 0 || democraticConsultationMechanismDouble > 3
-                || gridNegotiationCaseDouble < 0 || gridNegotiationCaseDouble > 4
-                || residentConventionSystemDouble < 0 || residentConventionSystemDouble > 3){
+                || gridNegotiationCaseDouble < 0 || gridNegotiationCaseDouble > 5
+                || residentConventionSystemDouble < 0 || residentConventionSystemDouble > 2){
             return true;
         }
         return false;
@@ -392,4 +392,4 @@ public class KpiCommunityBuildingServiceImpl extends BaseServiceImpl<KpiCommunit
         return entity;
     }
 
-}
+}