From ace8c6d3bfed173e1b3e3f5138710533d857dbfb Mon Sep 17 00:00:00 2001
From: yinzuomei <yinzuomei@elink-cn.com>
Date: Tue, 26 Nov 2019 20:01:23 +0800
Subject: [PATCH] =?UTF-8?q?epdc=5Fkpi=5Fformula=E6=96=B0=E5=A2=9Efunction?=
 =?UTF-8?q?=5Fname?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/elink/esua/epdc/dto/KpiFormulaDTO.java | 5 +++++
 .../java/com/elink/esua/epdc/entity/KpiFormulaEntity.java    | 5 +++++
 .../src/main/resources/mapper/KpiFormulaDao.xml              | 1 +
 3 files changed, 11 insertions(+)

diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiFormulaDTO.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiFormulaDTO.java
index 91ddc77b0..cc7252a4a 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiFormulaDTO.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiFormulaDTO.java
@@ -49,6 +49,11 @@ public class KpiFormulaDTO implements Serializable {
      */
 	private String name;
 
+	/**
+	 * 方法名
+	 */
+	private String functionName;
+
     /**
      * 公式运行方法（Javascript）
      */
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiFormulaEntity.java b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiFormulaEntity.java
index b4b4fd98b..90b3f7f87 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiFormulaEntity.java
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiFormulaEntity.java
@@ -48,6 +48,11 @@ public class KpiFormulaEntity extends BaseEpdcEntity {
      */
 	private String name;
 
+	/**
+	 * 方法名
+	 */
+	private String functionName;
+
     /**
      * 公式运行方法（Javascript）
      */
diff --git a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiFormulaDao.xml b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiFormulaDao.xml
index 48b67a1b4..588afe512 100644
--- a/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiFormulaDao.xml
+++ b/esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiFormulaDao.xml
@@ -7,6 +7,7 @@
         <result property="id" column="ID"/>
         <result property="code" column="CODE"/>
         <result property="name" column="NAME"/>
+        <result property="functionName" column="FUNCTION_NAME"/>
         <result property="formula" column="FORMULA"/>
         <result property="paramAmount" column="PARAM_AMOUNT"/>
         <result property="description" column="DESCRIPTION"/>