From 6d61bd057a655d246ec00228cf7a5f2cc4b2dafd Mon Sep 17 00:00:00 2001
From: "kuang.yife" <clunt@vip.163.com>
Date: Mon, 11 Dec 2023 10:13:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E7=BA=BF=E7=B4=A2=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=97=B6=E9=97=B4+=E6=9D=A5=E6=BA=90=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/system/phone/phone.html | 12 ++++++++++++
 .../main/resources/mapper/system/ClewPhoneMapper.xml |  9 +++++++++
 2 files changed, 21 insertions(+)

diff --git a/ruoyi-admin/src/main/resources/templates/system/phone/phone.html b/ruoyi-admin/src/main/resources/templates/system/phone/phone.html
index 3fc10db9..865c276a 100644
--- a/ruoyi-admin/src/main/resources/templates/system/phone/phone.html
+++ b/ruoyi-admin/src/main/resources/templates/system/phone/phone.html
@@ -14,6 +14,18 @@
                             <label>手机号：</label>
                             <input type="text" name="phone"/>
                         </li>
+                        <li>
+                            App来源：<select name="remark" th:with="type=${@dict.getType('app_source')}">
+                            <option value="">所有</option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                        </select>
+                        </li>
+                        <li class="select-time">
+                            <label>创建时间： </label>
+                            <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
+                            <span>-</span>
+                            <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
+                        </li>
                         <li>
                             <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
                             <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
diff --git a/ruoyi-system/src/main/resources/mapper/system/ClewPhoneMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ClewPhoneMapper.xml
index a44c21fa..dc3c6ec8 100644
--- a/ruoyi-system/src/main/resources/mapper/system/ClewPhoneMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/ClewPhoneMapper.xml
@@ -23,6 +23,15 @@
         <include refid="selectClewPhoneVo"/>
         <where>
             <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                AND date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                AND date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+            </if>
+            <if test="remark != null and remark != ''">
+                and remark = #{remark}
+            </if>
         </where>
         order by create_time desc
     </select>