From 6ab99298d737d827bd0c3e080d7b2f6bfdb1d5c5 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 8 Sep 2022 15:38:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=B1=BB=E5=88=AB=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/form/IcResiCategoryStatsConfigFormDTO.java |  9 ++++++++-
 .../result/IcResiCategoryStatsConfigResultDTO.java | 14 +++++++++++++-
 .../entity/IcResiCategoryStatsConfigEntity.java    |  8 ++++++++
 .../mapper/IcResiCategoryStatsConfigDao.xml        |  5 ++++-
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcResiCategoryStatsConfigFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcResiCategoryStatsConfigFormDTO.java
index 7d10474443..c5af9dc2c1 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcResiCategoryStatsConfigFormDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcResiCategoryStatsConfigFormDTO.java
@@ -74,5 +74,12 @@ public class IcResiCategoryStatsConfigFormDTO implements Serializable {
     private Integer level2;
 
     private Integer level3;
-
+    /**
+     * 自动匹配：开启1；不匹配：0
+     */
+    private String autoMatching;
+    /**
+     * 育龄妇女年龄范围，英文逗号隔开的数字例如：18,49
+     */
+    private String ylfnValue;
 }
diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcResiCategoryStatsConfigResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcResiCategoryStatsConfigResultDTO.java
index e161b60f6d..45ee8f8ce3 100644
--- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcResiCategoryStatsConfigResultDTO.java
+++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcResiCategoryStatsConfigResultDTO.java
@@ -44,7 +44,10 @@ public class IcResiCategoryStatsConfigResultDTO implements Serializable {
      */
 	private String label;
 
-
+    /**
+     * 列名
+     */
+    private String columnName;
 
     /**
      * 管理平台分类图标
@@ -84,4 +87,13 @@ public class IcResiCategoryStatsConfigResultDTO implements Serializable {
      * 等级3阈值
      */
     private Integer level3;
+
+    /**
+     * 自动匹配：开启1；不匹配：0
+     */
+    private String autoMatching;
+    /**
+     * 育龄妇女年龄范围，英文逗号隔开的数字例如：18,49
+     */
+    private String ylfnValue;
 }
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcResiCategoryStatsConfigEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcResiCategoryStatsConfigEntity.java
index d0201db93d..4a292260b9 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcResiCategoryStatsConfigEntity.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcResiCategoryStatsConfigEntity.java
@@ -80,4 +80,12 @@ public class IcResiCategoryStatsConfigEntity extends BaseEpmetEntity {
      */
 	private Integer sort;
 
+	/**
+	 * 自动匹配：开启1；不匹配：0
+	 */
+	private String autoMatching;
+	/**
+	 * 育龄妇女年龄范围，英文逗号隔开的数字例如：18,49
+	 */
+	private String ylfnValue;
 }
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryStatsConfigDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryStatsConfigDao.xml
index f138b59d0d..366690ed03 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryStatsConfigDao.xml
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryStatsConfigDao.xml
@@ -26,6 +26,7 @@
         select
         a.ID as id,
         a.LABEL as label,
+        a.COLUMN_NAME as columnName,
         a.MANAGEMENT_ICON as managementIcon,
         a.DATA_ICON as dataIcon,
         a.HOUSE_SHOW_ICON as houseShowIcon,
@@ -34,7 +35,9 @@
         b.LEVEL_1 as level1,
         b.LEVEL_2 as level2,
         b.LEVEL_3 as level3,
-        b.WARN
+        b.WARN,
+        a.AUTO_MATCHING as ,
+        a.YLFN_VALUE as
         from
         ic_resi_category_stats_config a
         left join ic_resi_category_warn_config b on a.TABLE_NAME = b.TABLE_NAME and a.COLUMN_NAME = b.COLUMN_NAME and b.DEL_FLAG =0 and b.CUSTOMER_ID = #{customerId}