From 5ffc37a032a753294beee4bce2a3b2aaa80db4ef Mon Sep 17 00:00:00 2001
From: "15989082884@163.com" <15989082884@163.com>
Date: Fri, 15 Sep 2023 16:05:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=A0=E9=81=93=20=20=E7=BD=91=E7=82=B9=20?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=B7=BB=E5=8A=A0=20=E6=9D=A1=E6=95=B0?=
 =?UTF-8?q?=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bms/controller/BmsChannelController.java     | 16 ++++++++++++----
 .../controller/BmsChannelPointController.java    |  7 +++++++
 .../qs/serve/modules/bms/entity/BmsChannel.java  |  3 +++
 .../modules/bms/entity/BmsChannelPoint.java      |  3 +++
 4 files changed, 25 insertions(+), 4 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 7c9039ea..93fbf794 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
@@ -7,10 +7,7 @@ import com.qs.serve.common.model.dto.PageVo;
 import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.model.enums.BizType;
 import com.qs.serve.common.model.enums.SystemModule;
-import com.qs.serve.common.util.CollectionUtil;
-import com.qs.serve.common.util.CopierUtil;
-import com.qs.serve.common.util.PageUtil;
-import com.qs.serve.common.util.StringUtils;
+import com.qs.serve.common.util.*;
 import com.qs.serve.modules.bms.common.MasterUserType;
 import com.qs.serve.modules.bms.controller.my.BmsChannelMyController;
 import com.qs.serve.modules.bms.entity.*;
@@ -77,9 +74,20 @@ public class BmsChannelController {
             channelWrapper.le(BmsChannel::getCreateTime, param.getSelectEndTime());
             channelWrapper.isNotNull(BmsChannel::getCreateBy);
         }
+        if(param.getExportNum()==null || param.getExportNum()==0){
+            Assert.throwEx("请输入导出条数");
+        }
+
         if(CollectionUtil.isNotEmpty(param.getSelectIds())){
             channelWrapper.in(BmsChannel::getId, param.getSelectIds());
         }
+
+        if(param.getExportNum()==null || param.getExportNum()==0){
+            Assert.throwEx("请输入导出条数");
+        }else{
+            channelWrapper.last(" limit "+param.getExportNum());
+        }
+
         List<BmsChannel> list = bmsChannelService.list(channelWrapper);
 
         List<Long> channelIds = list.stream().map(a->a.getId()).collect(Collectors.toList());
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 989caaf2..962795f0 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
@@ -87,6 +87,13 @@ public class BmsChannelPointController {
         if(CollectionUtil.isNotEmpty(param.getSelectIds())){
             lqw.in(BmsChannelPoint::getId, param.getSelectIds());
         }
+
+        if(param.getExportNum()==null || param.getExportNum()==0){
+            Assert.throwEx("请输入导出条数");
+        }else{
+            channelWrapper.last(" limit "+param.getExportNum());
+        }
+
         List<BmsChannelPoint> list = bmsChannelPointService.list(lqw);
         List<String> bizRegionIds = new ArrayList<>();
         bizRegionIds.addAll(list.stream().filter(a->a.getBizRegionId()!=null).map(a->a.getBizRegionId()).collect(Collectors.toList()));
diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsChannel.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsChannel.java
index 2893a66e..7676a937 100644
--- a/src/main/java/com/qs/serve/modules/bms/entity/BmsChannel.java
+++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsChannel.java
@@ -125,5 +125,8 @@ public class BmsChannel implements Serializable {
 
     @TableField(exist = false)
     private String seachSupplierName;
+
+    @TableField(exist = false)
+    private Integer exportNum;
 }
 
diff --git a/src/main/java/com/qs/serve/modules/bms/entity/BmsChannelPoint.java b/src/main/java/com/qs/serve/modules/bms/entity/BmsChannelPoint.java
index 7f19a0fd..c68c7ce1 100644
--- a/src/main/java/com/qs/serve/modules/bms/entity/BmsChannelPoint.java
+++ b/src/main/java/com/qs/serve/modules/bms/entity/BmsChannelPoint.java
@@ -217,5 +217,8 @@ public class BmsChannelPoint implements Serializable {
 
     @TableField(exist = false)
     private List<String> supplierNames;
+
+    @TableField(exist = false)
+    private Integer exportNum;
 }