From a5eb4ea7bf85e7b6248f7c8c12431d8505271f98 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Mon, 7 Sep 2020 10:15:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=8E=E7=BB=86=20?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=80=A7=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/util/Pinyin4jUtil.java             | 3 ++-
 .../evaluationindex/screen/IndexGroupDetailTemplateDao.xml     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/util/Pinyin4jUtil.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/util/Pinyin4jUtil.java
index b3a9ac1760..8d392a2c21 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/util/Pinyin4jUtil.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/util/Pinyin4jUtil.java
@@ -29,7 +29,8 @@ public class Pinyin4jUtil {
         duoyinMap.put('期',new String[]{"qi"});
         duoyinMap.put('参',new String[]{"can"});
         duoyinMap.put('均',new String[]{"jun"});
-        duoyinMap.put('会',new String[]{"hui"});
+        duoyinMap.put('会', new String[]{"hui"});
+        duoyinMap.put('属', new String[]{"shu"});
     }
 
     /**
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/IndexGroupDetailTemplateDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/IndexGroupDetailTemplateDao.xml
index df9ec89823..a8e5f55a2e 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/IndexGroupDetailTemplateDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/IndexGroupDetailTemplateDao.xml
@@ -7,7 +7,7 @@
         delete from index_group_detail_template
     </delete>
     <select id="selectAll" resultType="com.epmet.entity.evaluationindex.screen.IndexGroupDetailTemplateEntity">
-        select ID, INDEX_GROUP_ID, INDEX_ID, INDEX_CODE, WEIGHT, THRESHOLD, ALL_PARENT_INDEX_CODE
+        select ID, INDEX_GROUP_ID, INDEX_ID, INDEX_CODE, WEIGHT, THRESHOLD, ALL_PARENT_INDEX_CODE, CORRELATION
         from index_group_detail_template
         where STATUS = 'enable' and DEL_FLAG = '0'
     </select>