From f810e358732ad9cd4c4cde63cdada2d4af6301a8 Mon Sep 17 00:00:00 2001
From: "wei.peng" <pengwei940613@163.com>
Date: Thu, 11 Apr 2019 09:22:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=20=E6=95=B0=E6=8D=AE=E6=93=8D=E4=BD=9C=E6=8E=A5=E5=8F=A3=20DAO?=
 =?UTF-8?q?=20=E5=B1=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java     | 2 +-
 .../java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java   | 4 ++++
 .../cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java  | 8 ++++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java
index 1e82aa4..95cb885 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/dynamic/DynamicEntity.java
@@ -221,7 +221,7 @@ public class DynamicEntity extends BaseBean implements Serializable {
      */
     public Object getDynProperty(String propName){
         //初始化set方法
-        String setMethodName = "get" + propName.substring(0,1).toUpperCase() + propName.substring(1);
+        String setMethodName = "get" + CaseFormat.UPPER_UNDERSCORE.to(CaseFormat.UPPER_CAMEL, propName);
 
         try {
             //获取方法
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
index 104f18e..6c19f95 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
@@ -521,6 +521,10 @@ public class CommonEnumUtil {
             return value;
         }
 
+        public String getValueStr() {
+            return value + "";
+        }
+
         public String getDescription() {
             return description;
         }
diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java
index 604535d..f52cb1b 100644
--- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java
+++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java
@@ -38,6 +38,10 @@ public class BfElementPropertyVirtual extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long elementId;
 
+    @Column(name="PROPERTY_CODE")
+    @ApiParam(value ="类属性名称")
+    private String propertyCode;
+
     @Column(name="PROPERTY_NAME")
     @ApiParam(value ="元素名称")
     private String propertyName;
@@ -71,6 +75,10 @@ public class BfElementPropertyVirtual extends BaseBean {
     private List<BfElementProperty> propertyList;
 
     @Transient
+    @ApiParam(value = "虚拟属性列表")
+    private List<BfRefElementPropertyVirtualDetail> detailList;
+
+    @Transient
     @ApiParam(value = "虚拟属性ID列表")
     @JsonSerialize(using = ToStringSerializer.class)
     private List<Long> propertyIdList;