From 1f2317a06b14c5e72edbd1dd4047cfe9d89cfab2 Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Mon, 8 Apr 2024 11:24:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=BC=E5=85=A5=EF=BC=8C=E5=91=BC=E5=87=BA?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E6=97=B6=E9=97=B4=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/system/incoming/incoming.html     | 6 ++++++
 .../resources/templates/system/outbound/outbound.html     | 6 ++++++
 .../java/com/ruoyi/system/domain/FsChannelRecord.java     | 8 ++++++++
 .../resources/mapper/system/FsChannelRecordMapper.xml     | 6 ++++++
 4 files changed, 26 insertions(+)

diff --git a/ruoyi-admin/src/main/resources/templates/system/incoming/incoming.html b/ruoyi-admin/src/main/resources/templates/system/incoming/incoming.html
index 4bb35b8..16774c2 100644
--- a/ruoyi-admin/src/main/resources/templates/system/incoming/incoming.html
+++ b/ruoyi-admin/src/main/resources/templates/system/incoming/incoming.html
@@ -16,6 +16,12 @@
 							<li>
 								号码区号：<input type="text" name="areacode"/>
 							</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-admin/src/main/resources/templates/system/outbound/outbound.html b/ruoyi-admin/src/main/resources/templates/system/outbound/outbound.html
index fd41cac..d987d42 100644
--- a/ruoyi-admin/src/main/resources/templates/system/outbound/outbound.html
+++ b/ruoyi-admin/src/main/resources/templates/system/outbound/outbound.html
@@ -16,6 +16,12 @@
 							<li>
 								号码区号：<input type="text" name="areacode"/>
 							</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/java/com/ruoyi/system/domain/FsChannelRecord.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/FsChannelRecord.java
index 1c15953..3b9cbef 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/FsChannelRecord.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/FsChannelRecord.java
@@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -221,4 +224,9 @@ public class FsChannelRecord implements Serializable {
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
+
+    /** 请求参数 */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @TableField(exist=false)
+    private Map<String, Object> params;
 }
\ No newline at end of file
diff --git a/ruoyi-system/src/main/resources/mapper/system/FsChannelRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/system/FsChannelRecordMapper.xml
index 7ca5099..4b04856 100644
--- a/ruoyi-system/src/main/resources/mapper/system/FsChannelRecordMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/FsChannelRecordMapper.xml
@@ -120,6 +120,12 @@
             <if test="areacode != null and areacode != ''">
                 AND a.areacode = #{areacode}
             </if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(a.start,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(a.start,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+            </if>
         </where>
         order by end desc
     </select>