From 393cd41a73016eff7a127cef63f7071cc7ec0f8f Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Tue, 20 Feb 2024 10:48:08 +0800
Subject: [PATCH] =?UTF-8?q?Bug=E4=BF=AE=E5=A4=8D:=E3=80=90ID1000417?=
 =?UTF-8?q?=E3=80=91=20=20=20=20=20=20=20=E4=BC=9A=E5=91=98=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E6=90=9C=E7=B4=A2=E7=9A=84=E7=94=9F=E6=97=A5?=
 =?UTF-8?q?=E6=98=AF=E9=9C=80=E8=A6=81=E6=90=9C=E7=B4=A2=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/domain/req/WxUserMemberVm.java       | 13 ++++++++++
 .../resources/mapper/WxUserMemberMapper.xml   |  5 ++++
 flossom-ui/src/views/system/member/index.vue  | 24 +++++++++++++++----
 3 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberVm.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberVm.java
index 9b360b9..be5e161 100644
--- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberVm.java
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/req/WxUserMemberVm.java
@@ -68,6 +68,11 @@ public class WxUserMemberVm extends BaseEntity {
      */
     private Date birthday;
 
+    /**
+     * 生日
+     */
+    private List<Date> birthdayRange;
+
     /**
      * 用户注册起始时间
      */
@@ -298,4 +303,12 @@ public class WxUserMemberVm extends BaseEntity {
     public void setDevicesIdList(List<Long> devicesIdList) {
         this.devicesIdList = devicesIdList;
     }
+
+    public List<Date> getBirthdayRange() {
+        return birthdayRange;
+    }
+
+    public void setBirthdayRange(List<Date> birthdayRange) {
+        this.birthdayRange = birthdayRange;
+    }
 }
diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml
index 8aff65f..7264723 100644
--- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml
+++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserMemberMapper.xml
@@ -382,6 +382,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="cityId != null  and cityId != ''"> and member.city_id = #{cityId}</if>
             <if test="areaId != null  and areaId != ''"> and member.area_id = #{areaId}</if>
             <if test="birthday != null "> and member.birthday = #{birthday}</if>
+
+            <if test="birthdayRange != null and birthdayRange.size > 0">
+                and member.birthday &gt;= #{birthdayRange[0]}
+                and member.birthday &lt;= #{birthdayRange[1]}
+            </if>
             <if test="id!=null and id !=''">
                 and
                 <foreach collection="id.split(',')" index="index" item="item" open="(" separator="OR"
diff --git a/flossom-ui/src/views/system/member/index.vue b/flossom-ui/src/views/system/member/index.vue
index 2932092..ffad776 100644
--- a/flossom-ui/src/views/system/member/index.vue
+++ b/flossom-ui/src/views/system/member/index.vue
@@ -102,13 +102,24 @@
               <div style="width: 20px"></div>
               <div class="mini-label">
                 <el-form-item label="生日" prop="birthday">
+<!--                  <el-date-picker-->
+<!--                    style="width: 126px"-->
+<!--                    clearable-->
+<!--                    v-model="queryParams.birthday"-->
+<!--                    type="date"-->
+<!--                    value-format="yyyy-MM-dd"-->
+<!--                    placeholder="请选择生日"-->
+<!--                  >-->
+<!--                  </el-date-picker>-->
                   <el-date-picker
-                    style="width: 126px"
-                    clearable
-                    v-model="queryParams.birthday"
-                    type="date"
+                    style="width: 360px"
+                    v-model="queryParams.birthdayRange"
+                    type="daterange"
+                    range-separator="至"
+                    start-placeholder="开始日期"
                     value-format="yyyy-MM-dd"
-                    placeholder="请选择生日"
+                    end-placeholder="结束日期"
+                    align="right"
                   >
                   </el-date-picker>
                 </el-form-item>
@@ -1585,6 +1596,7 @@ export default {
         areaId: null,
         area: null,
         birthday: null,
+        birthdayRange: [],
         clock: null,
         activity: null,
         wechat: null,
@@ -1987,6 +1999,7 @@ export default {
         area: null,
         areaId: null,
         birthday: null,
+        birthdayRange: [],
         clock: null,
         activity: null,
         wechat: null,
@@ -2031,6 +2044,7 @@ export default {
         areaId: null,
         area: null,
         birthday: null,
+        birthdayRange: [],
         clock: null,
         activity: null,
         wechat: null,