From 0226eda45026586cb0e1479851eb073e17c924dc Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 21 Jul 2022 15:11:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E5=E4=B8=AA=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/policy/IcPolicyRuleDetailDTO.java    | 24 +++++++++++++++++++
 .../entity/IcPolicyRuleDetailEntity.java      | 23 ++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java
index 79be9a25ff..d9f15f9637 100644
--- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java
+++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java
@@ -66,5 +66,29 @@ public class IcPolicyRuleDetailDTO {
      */
     @NotBlank(message = "参数值不能为空", groups = {ResiRulerShowGroup.class,HouseRulerShowGroup.class,StatRulerShowGroup.class})
     private String colVal;
+
+    /**
+     * 用于前端展示：基础信息、教育信息、房屋类型.....
+     */
+    private String itemGroupName;
+    /**
+     * 用于前端展示：姓名、手机号、......
+     */
+    private String itemLabel;
+
+    /**
+     * 用于前端展示：等于、不等于、大于、小于....
+     */
+    private String queryTypeName;
+
+    /**
+     * 用于前端展示：参数值显示值eg:男女
+     */
+    private String colValLabel;
+
+    /**
+     * 用于前端展示：逻辑：并且、或者
+     */
+    private String nextLogicalRelName;
 }
 
diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPolicyRuleDetailEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPolicyRuleDetailEntity.java
index 7516f2aca6..9a29c03d1b 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPolicyRuleDetailEntity.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPolicyRuleDetailEntity.java
@@ -84,4 +84,27 @@ public class IcPolicyRuleDetailEntity extends BaseEpmetEntity {
      */
 	private Integer sort;
 
+	/**
+	 * 用于前端展示：基础信息、教育信息、房屋类型.....
+	 */
+	private String itemGroupName;
+	/**
+	 * 用于前端展示：姓名、手机号、......
+	 */
+	private String itemLabel;
+
+	/**
+	 * 用于前端展示：等于、不等于、大于、小于....
+	 */
+	private String queryTypeName;
+
+	/**
+	 * 用于前端展示：参数值显示值eg:男女
+	 */
+	private String colValLabel;
+
+	/**
+	 * 用于前端展示：逻辑：并且、或者
+	 */
+	private String nextLogicalRelName;
 }