From 0a4c54a2b00651ed3058ac9f8a5093b5d26a0446 Mon Sep 17 00:00:00 2001
From: "15989082884@163.com" <15989082884@163.com>
Date: Fri, 15 Sep 2023 16:13:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=A0=E9=81=93=20=E7=BD=91=E7=82=B9=20?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/bms/controller/BmsChannelController.java |  8 ++++++++
 .../bms/controller/BmsChannelPointController.java    |  2 +-
 src/main/resources/mapper/bms/BmsChannelMapper.xml   |  4 ++--
 .../resources/mapper/bms/BmsChannelPointMapper.xml   | 12 ++++++++++--
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java
index 93fbf794..4db80f25 100644
--- a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java
+++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelController.java
@@ -124,6 +124,14 @@ public class BmsChannelController {
 
 
         LambdaQueryWrapper<BmsChannel> channelWrapper = new LambdaQueryWrapper<>(param);
+        if(param.getSelectStartTime()!=null) {
+            channelWrapper.ge(BmsChannel::getCreateTime, param.getSelectStartTime());
+            channelWrapper.isNotNull(BmsChannel::getCreateBy);
+        }
+        if(param.getSelectEndTime()!=null) {
+            channelWrapper.le(BmsChannel::getCreateTime, param.getSelectEndTime());
+            channelWrapper.isNotNull(BmsChannel::getCreateBy);
+        }
         channelWrapper.orderByDesc(BmsChannel::getCreateTime);
 
 
diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java
index 962795f0..c5de75df 100644
--- a/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java
+++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java
@@ -91,7 +91,7 @@ public class BmsChannelPointController {
         if(param.getExportNum()==null || param.getExportNum()==0){
             Assert.throwEx("请输入导出条数");
         }else{
-            channelWrapper.last(" limit "+param.getExportNum());
+            lqw.last(" limit "+param.getExportNum());
         }
 
         List<BmsChannelPoint> list = bmsChannelPointService.list(lqw);
diff --git a/src/main/resources/mapper/bms/BmsChannelMapper.xml b/src/main/resources/mapper/bms/BmsChannelMapper.xml
index 3362c723..b9dcaae4 100644
--- a/src/main/resources/mapper/bms/BmsChannelMapper.xml
+++ b/src/main/resources/mapper/bms/BmsChannelMapper.xml
@@ -62,8 +62,8 @@
             <if test="query.channelName != null and query.channelName != ''"> and `bms_channel`.`channel_name` like concat('%',#{query.channelName},'%') </if>
             <if test="query.channelType != null and query.channelType != ''"> and `bms_channel`.`channel_type` = #{query.channelType}</if>
             <if test="query.remark != null and query.remark != ''"> and `bms_channel`.`remark` = #{query.remark}</if>
-            <if test="query.createTime != null"> and `bms_channel`.`create_time` = #{query.createTime}</if>
-            <if test="query.updateTime != null"> and `bms_channel`.`update_time` = #{query.updateTime}</if>
+            <if test="query.selectStartTime != null"> and `bms_channel`.`create_time` &gt;= #{query.selectStartTime}</if>
+            <if test="query.selectEndTime != null"> and `bms_channel`.`create_time` &lt;= #{query.selectEndTime}</if>
             <if test="query.tenantId != null and query.tenantId != ''"> and `bms_channel`.`tenant_id` = #{query.tenantId}</if>
             <if test="query.delFlag != null and query.delFlag != ''"> and `bms_channel`.`del_flag` = #{query.delFlag}</if>
             <if test="query.createBy != null and query.createBy != ''"> and `bms_channel`.`create_by` = #{query.createBy}</if>
diff --git a/src/main/resources/mapper/bms/BmsChannelPointMapper.xml b/src/main/resources/mapper/bms/BmsChannelPointMapper.xml
index 438c74f6..059eed68 100644
--- a/src/main/resources/mapper/bms/BmsChannelPointMapper.xml
+++ b/src/main/resources/mapper/bms/BmsChannelPointMapper.xml
@@ -104,8 +104,8 @@
             <if test="query.bizRegionPath != null and query.bizRegionPath != ''"> and `bms_channel_point`.`biz_region_path`  like concat('%',#{query.bizRegionPath},'%') </if>
             <if test="query.bizRegionPathIds != null and query.bizRegionPathIds != ''"> and `bms_channel_point`.`biz_region_path_ids` = #{query.bizRegionPathIds}</if>
             <if test="query.remark != null and query.remark != ''"> and `bms_channel_point`.`remark` = #{query.remark}</if>
-            <if test="query.createTime != null"> and `bms_channel_point`.`create_time` = #{query.createTime}</if>
-            <if test="query.updateTime != null"> and `bms_channel_point`.`update_time` = #{query.updateTime}</if>
+            <if test="query.selectStartTime != null"> and `bms_channel_point`.`create_time` &gt;= #{query.selectStartTime}</if>
+            <if test="query.selectEndTime != null"> and `bms_channel_point`.`create_time` &lt;= #{query.selectEndTime}</if>
             <if test="query.tenantId != null and query.tenantId != ''"> and `bms_channel_point`.`tenant_id` = #{query.tenantId}</if>
             <if test="query.createBy != null and query.createBy != ''"> and `bms_channel_point`.`create_by` = #{query.createBy}</if>
             <if test="query.updateBy != null and query.updateBy != ''"> and `bms_channel_point`.`update_by` = #{query.updateBy}</if>
@@ -223,6 +223,8 @@
             <if test="query.bizRegionPath != null and query.bizRegionPath != ''"> and `bms_channel_point`.`biz_region_path`  like concat('%',#{query.bizRegionPath},'%') </if>
             <if test="query.bizRegionPathIds != null and query.bizRegionPathIds != ''"> and `bms_channel_point`.`biz_region_path_ids` = #{query.bizRegionPathIds}</if>
             <if test="query.remark != null and query.remark != ''"> and `bms_channel_point`.`remark` = #{query.remark}</if>
+            <if test="query.selectStartTime != null"> and `bms_channel_point`.`create_time` &gt;= #{query.selectStartTime}</if>
+            <if test="query.selectEndTime != null"> and `bms_channel_point`.`create_time` &lt;= #{query.selectEndTime}</if>
         </where>
         ORDER BY
         bms_channel_point.id
@@ -282,6 +284,8 @@
             <if test="query.bizRegionPath != null and query.bizRegionPath != ''"> and `bms_channel_point`.`biz_region_path`  like concat('%',#{query.bizRegionPath},'%') </if>
             <if test="query.bizRegionPathIds != null and query.bizRegionPathIds != ''"> and `bms_channel_point`.`biz_region_path_ids` = #{query.bizRegionPathIds}</if>
             <if test="query.remark != null and query.remark != ''"> and `bms_channel_point`.`remark` = #{query.remark}</if>
+            <if test="query.selectStartTime != null"> and `bms_channel_point`.`create_time` &gt;= #{query.selectStartTime}</if>
+            <if test="query.selectEndTime != null"> and `bms_channel_point`.`create_time` &lt;= #{query.selectEndTime}</if>
         </where>
         ORDER BY
         bms_channel_point.id
@@ -322,6 +326,8 @@
             <if test="query.bizRegionPath != null and query.bizRegionPath != ''"> and `bms_channel_point`.`biz_region_path`  like concat('%',#{query.bizRegionPath},'%') </if>
             <if test="query.bizRegionPathIds != null and query.bizRegionPathIds != ''"> and `bms_channel_point`.`biz_region_path_ids` = #{query.bizRegionPathIds}</if>
             <if test="query.remark != null and query.remark != ''"> and `bms_channel_point`.`remark` = #{query.remark}</if>
+            <if test="query.selectStartTime != null"> and `bms_channel_point`.`create_time` &gt;= #{query.selectStartTime}</if>
+            <if test="query.selectEndTime != null"> and `bms_channel_point`.`create_time` &lt;= #{query.selectEndTime}</if>
         </where>
         limit #{rowInfo.startIndex},#{rowInfo.size}
     </select>
@@ -359,6 +365,8 @@
             <if test="query.bizRegionPath != null and query.bizRegionPath != ''"> and `bms_channel_point`.`biz_region_path`  like concat('%',#{query.bizRegionPath},'%') </if>
             <if test="query.bizRegionPathIds != null and query.bizRegionPathIds != ''"> and `bms_channel_point`.`biz_region_path_ids` = #{query.bizRegionPathIds}</if>
             <if test="query.remark != null and query.remark != ''"> and `bms_channel_point`.`remark` = #{query.remark}</if>
+            <if test="query.selectStartTime != null"> and `bms_channel_point`.`create_time` &gt;= #{query.selectStartTime}</if>
+            <if test="query.selectEndTime != null"> and `bms_channel_point`.`create_time` &lt;= #{query.selectEndTime}</if>
         </where>
     </select>