添加allParentIndexCode

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/AgencyScoreDTO.java

@@ -17,14 +17,13 @@
 
 package com.epmet.dto.indexcal;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.constant.IndexCalConstant;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 区/街道相关分数表 
@@ -87,6 +86,12 @@ public class AgencyScoreDTO implements Serializable {
      */
     private String indexCode;
 
+    /**
+     * 所有指标code拼接的字符串 冒号隔开
+     */
+    private String allParentIndexCode;
+
+
     /**
      * 数据类型 district  ：全区；street：街道
      */

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/DeptScoreDTO.java

@@ -17,11 +17,11 @@
 
 package com.epmet.dto.indexcal;
 
-import java.io.Serializable;
-import java.util.Date;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 区直部门分值表
@@ -84,6 +84,12 @@ public class DeptScoreDTO implements Serializable {
      */
     private String indexCode;
 
+    /**
+     * 所有指标code拼接的字符串 冒号隔开
+     */
+    private String allParentIndexCode;
+
+
     /**
      *
      */

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/CpcScoreEntity.java

@@ -78,6 +78,11 @@ public class CpcScoreEntity extends BaseEpmetEntity {
      */
     private String indexCode;
 
+    /**
+     * 所有指标code拼接的字符串 冒号隔开
+     */
+    private String allParentIndexCode;
+
     /**
      * 是否是总分 1是0不是
      */

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/DeptScoreEntity.java

@@ -82,4 +82,9 @@ public class DeptScoreEntity extends BaseEpmetEntity {
      */
     private String indexCode;
 
+    /**
+     * 所有指标code拼接的字符串 冒号隔开
+     */
+    private String allParentIndexCode;
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/GridScoreEntity.java

@@ -87,4 +87,9 @@ public class GridScoreEntity extends BaseEpmetEntity {
      */
     private String indexCode;
 
+    /**
+     * 所有指标code拼接的字符串 冒号隔开
+     */
+    private String allParentIndexCode;
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/FactIndexCommunityScoreEntity.java

@@ -82,4 +82,9 @@ public class FactIndexCommunityScoreEntity extends BaseEpmetEntity {
      */
     private String indexCode;
 
+    /**
+     * 所有指标code拼接的字符串 冒号隔开
+     */
+    private String allParentIndexCode;
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/IndexDictEntity.java

@@ -40,6 +40,11 @@ public class IndexDictEntity extends BaseEpmetEntity {
 	 */
 	private String indexName;
 
+	/**
+	 * 指标编码
+	 */
+	private String indexCode;
+
 	/**
 	 * 指标描述
 	 */

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java

@@ -266,6 +266,7 @@ public class IndexExcelDataListener extends AnalysisEventListener<IndexModel> {
             entity.setIndexName(data.getLevel1Index());
             entity.setCorrelation(data.getCorrelation());
             entity.setLevel("1");
+            entity.setIndexCode(Pinyin4jUtil.getSpellPinYin(data.getLevel1Index(), false, 4));
             indexDicMap.put(data.getLevel1Index(), entity);
         }
         if (!indexDicMap.containsKey(data.getLevel2Index())) {
@@ -273,6 +274,7 @@ public class IndexExcelDataListener extends AnalysisEventListener<IndexModel> {
             entity2.setIndexName(data.getLevel2Index());
             entity2.setCorrelation(data.getCorrelation());
             entity2.setLevel("2");
+            entity.setIndexCode(Pinyin4jUtil.getSpellPinYin(data.getLevel2Index(), false, 4));
             indexDicMap.put(data.getLevel2Index(), entity2);
         }
         if (!indexDicMap.containsKey(data.getLevel3Index())) {
@@ -280,6 +282,7 @@ public class IndexExcelDataListener extends AnalysisEventListener<IndexModel> {
             entity3.setIndexName(data.getLevel3Index());
             entity3.setCorrelation(data.getCorrelation());
             entity3.setLevel("3");
+            entity.setIndexCode(Pinyin4jUtil.getSpellPinYin(data.getLevel3Index(), false, 4));
             indexDicMap.put(data.getLevel3Index(), entity3);
         }
         if (!indexDicMap.containsKey(data.getLevel4Index())) {
@@ -287,6 +290,7 @@ public class IndexExcelDataListener extends AnalysisEventListener<IndexModel> {
             entity4.setIndexName(data.getLevel4Index());
             entity4.setCorrelation(data.getCorrelation());
             entity4.setLevel("4");
+            entity.setIndexCode(Pinyin4jUtil.getSpellPinYin(data.getLevel4Index(), false, 4));
             indexDicMap.put(data.getLevel4Index(), entity4);
         }
         if (!indexDicMap.containsKey(data.getLevel5Index())) {
@@ -294,6 +298,7 @@ public class IndexExcelDataListener extends AnalysisEventListener<IndexModel> {
             entity5.setIndexName(data.getLevel5Index());
             entity5.setCorrelation(data.getCorrelation());
             entity5.setLevel("5");
+            entity.setIndexCode(Pinyin4jUtil.getSpellPinYin(data.getLevel5Index(), false, 4));
             indexDicMap.put(data.getLevel5Index(), entity5);
         }
     }