avgShiftProjectRatio=>issueToProjectRatio

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/form/GridGovrnAbilityFormDTO.java

@@ -73,7 +73,7 @@ public class GridGovrnAbilityFormDTO implements Serializable {
     /**
      * 网格议题转项目率
      */
-    private BigDecimal avgShiftProjectRatio;
+    private BigDecimal issueToProjectRatio;
 
     /**
      * 网格自治项目数 统计期网格自身内办结的项目数目

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java

@@ -327,7 +327,7 @@ public class DemoController {
 
         entity.setIssueTotal(100); //网格总议题数
         entity.setAvgIssueCount(100); //网格人均议题数目
-        entity.setAvgShiftProjectRatio(new BigDecimal("20")); //网格议题转项目率
+        entity.setIssueToProjectRatio(new BigDecimal("20")); //网格议题转项目率
         entity.setProjectTotal(20);// 网格总项目数
         entity.setSelfSolveProjectCount(10); // 网格自治项目数 统计期网格自身内办结的项目数目
         entity.setResolveProjectCount(100);//网格办结项目数 统计期内办结的项目数目
@@ -351,7 +351,7 @@ public class DemoController {
 
         entity.setIssueTotal(70); //网格总议题数
         entity.setAvgIssueCount(10); //网格人均议题数目
-        entity.setAvgShiftProjectRatio(new BigDecimal("20")); //网格议题转项目率
+        entity.setIssueToProjectRatio(new BigDecimal("20")); //网格议题转项目率
         entity.setProjectTotal(40);// 网格总项目数
         entity.setSelfSolveProjectCount(15); // 网格自治项目数 统计期网格自身内办结的项目数目
         entity.setResolveProjectCount(20);//网格办结项目数 统计期内办结的项目数目
@@ -375,7 +375,7 @@ public class DemoController {
 
         entity.setIssueTotal(80); //网格总议题数
         entity.setAvgIssueCount(70); //网格人均议题数目
-        entity.setAvgShiftProjectRatio(new BigDecimal("100")); //网格议题转项目率
+        entity.setIssueToProjectRatio(new BigDecimal("100")); //网格议题转项目率
         entity.setProjectTotal(100);// 网格总项目数
         entity.setSelfSolveProjectCount(20); // 网格自治项目数 统计期网格自身内办结的项目数目
         entity.setResolveProjectCount(20);//网格办结项目数 统计期内办结的项目数目

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/indexcoll/FactIndexGovrnAblityGridMonthlyEntity.java

@@ -82,7 +82,7 @@ public class FactIndexGovrnAblityGridMonthlyEntity extends BaseEpmetEntity {
     /**
      * 网格议题转项目率
      */
-	private BigDecimal avgShiftProjectRatio;
+	private BigDecimal issueToProjectRatio;
 
     /**
      * 网格总项目数

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/eum/IndexCodeEnum.java

@@ -24,7 +24,7 @@ public enum IndexCodeEnum {
     DANG_WU_HUO_DONG("dangwuhuodong", "党务活动", 4),
     LIAN_XI_QUN_ZHONG("lianxiqunzhong", "联系群众", 4),
     ZUZHINEIDANGYDLXQZNLKPFPJZ("zuzhineidangydlxqznlkpfpjz","组织内党员的联系群众能力考评分（平均值）",5),
-    ZUZHINEIDANGYDSYYSNLKPFPJZ("zuzhineidangydsyysnlkpfpjz","组织内党员的参与议事能力考评分（平均值）",5),
+    ZUZHINEIDANGYDSYYSNLKPFPJZ("zuzhineidangydcyysnlkpfpjz","组织内党员的参与议事能力考评分（平均值）",5),
     ;
 
     private String code;

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/GridCorreLationServiceImpl.java

@@ -410,8 +410,10 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
                 //获取指标对应的列名
                 String fieldName = indexCodeFieldReService.getFieldNameByIndexCode(index.getIndexCode());
                 if (StringUtils.isBlank(fieldName)) {
-                    logger.error("index_code:{} ",index.getIndexCode(),"not find field_name");
+                    logger.error("index_code1:{} not find field_name",index.getIndexCode());
                     continue;
+                }else{
+                    logger.info("index_code2:{} ,field_name:{}",index.getIndexCode(),fieldName);
                 }
 //                logger.info("index_code:{} ",index.getIndexCode(),"field_id :{} ",fieldName);
                 String minValueKey = fieldName.concat(StrConstant.UNDER_LINE).concat(StrConstant.MIN);

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/indexcoll/FactIndexGovrnAblityGridMonthlyDao.xml

@@ -13,7 +13,7 @@
         <result property="yearId" column="YEAR_ID"/>
         <result property="issueTotal" column="ISSUE_TOTAL"/>
         <result property="avgIssueCount" column="AVG_ISSUE_COUNT"/>
-        <result property="avgShiftProjectRatio" column="AVG_SHIFT_PROJECT_RATIO"/>
+        <result property="issueToProjectRatio" column="ISSUE_TO_PROJECT_RATIO"/>
         <result property="projectTotal" column="PROJECT_TOTAL"/>
         <result property="selfSolveProjectCount" column="SELF_SOLVE_PROJECT_COUNT"/>
         <result property="resolveProjectCount" column="RESOLVE_PROJECT_COUNT"/>
@@ -45,7 +45,7 @@
         YEAR_ID,
         ISSUE_TOTAL,
         AVG_ISSUE_COUNT,
-        AVG_SHIFT_PROJECT_RATIO,
+        ISSUE_TO_PROJECT_RATIO,
         PROJECT_TOTAL,
         SELF_SOLVE_PROJECT_COUNT,
         RESOLVE_PROJECT_COUNT,
@@ -69,7 +69,7 @@
             #{item.yearId},
             #{item.issueTotal},
             #{item.avgIssueCount},
-            #{item.avgShiftProjectRatio},
+            #{item.issueToProjectRatio},
             #{item.projectTotal},
             #{item.selfSolveProjectCount},
             #{item.resolveProjectCount},
@@ -93,7 +93,7 @@
             m.MONTH_ID,
             m.ISSUE_TOTAL,
             m.AVG_ISSUE_COUNT,
-            m.AVG_SHIFT_PROJECT_RATIO,
+            m.ISSUE_TO_PROJECT_RATIO,
             m.PROJECT_TOTAL,
             m.SELF_SOLVE_PROJECT_COUNT,
             m.RESOLVE_PROJECT_COUNT,
@@ -119,8 +119,8 @@
             MAX(m.ISSUE_TOTAL) AS ISSUE_TOTAL_MAX,
             MIN(m.AVG_ISSUE_COUNT) AS AVG_ISSUE_COUNT_MIN,
             MAX(m.AVG_ISSUE_COUNT) AS AVG_ISSUE_COUNT_MAX,
-            MIN(m.AVG_SHIFT_PROJECT_RATIO) AS AVG_SHIFT_PROJECT_RATIO_MIN,
+            MIN(m.ISSUE_TO_PROJECT_RATIO) AS ISSUE_TO_PROJECT_RATIO_MIN,
-            MAX(m.AVG_SHIFT_PROJECT_RATIO) AS AVG_SHIFT_PROJECT_RATIO_MAX,
+            MAX(m.ISSUE_TO_PROJECT_RATIO) AS ISSUE_TO_PROJECT_RATIO_MAX,
             MIN(m.PROJECT_TOTAL) AS PROJECT_TOTAL_MIN,
             MAX(m.PROJECT_TOTAL) AS PROJECT_TOTAL_MAX,
             MIN(m.SELF_SOLVE_PROJECT_COUNT) AS SELF_SOLVE_PROJECT_COUNT_MIN,