From c9fa62cc8b0597a71d615e72b544700aa3aa44b2 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Wed, 26 Aug 2020 18:16:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=A6=81=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E7=9A=84=E6=8C=87=E6=A0=87=E6=98=8E=E7=BB=86=E6=9D=83=E9=87=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/entity/screen/IndexCodeFieldReEntity.java  | 9 +++++++++
 .../main/resources/mapper/screen/IndexGroupDetailDao.xml | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/IndexCodeFieldReEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/IndexCodeFieldReEntity.java
index 1e563a118b..7821fbe41b 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/IndexCodeFieldReEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/IndexCodeFieldReEntity.java
@@ -9,4 +9,13 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper=false)
 @TableName("index_code_field_re")
 public class IndexCodeFieldReEntity extends BaseEpmetEntity {
+    /**
+     * 指标code
+     */
+    private String indexCode;
+
+    /**
+     * 字段名
+     */
+    private String fieldId;
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/IndexGroupDetailDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/IndexGroupDetailDao.xml
index ac4ad73bd5..12eacafdd2 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/IndexGroupDetailDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/screen/IndexGroupDetailDao.xml
@@ -5,7 +5,7 @@
 
 
     <select id="getDetailListByParentCode" resultType="com.epmet.entity.screen.IndexGroupDetailEntity">
-        select ID, INDEX_GROUP_ID, INDEX_ID, WEIGHT, THRESHOLD FROM index_group_detail_template
+        select ID, INDEX_GROUP_ID, INDEX_ID, INDEX_CODE, WEIGHT, THRESHOLD FROM index_group_detail_template
         where STATUS = 'enable' and DEL_FLAG = '0'
     </select>
 </mapper>
\ No newline at end of file