21

src/main/java/com/fdkankan/manage/common/CacheUtil.java

@@ -0,0 +1,8 @@
+package com.fdkankan.manage.common;
+
+import com.fdkankan.manage.vo.request.OrderParam;
+
+public class CacheUtil {
+
+    public static OrderParam orderParam;
+}

src/main/java/com/fdkankan/manage/service/impl/DownloadOrderServiceImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.excel.ExcelWriter;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.manage.common.CacheUtil;
 import com.fdkankan.manage.entity.DownloadOrder;
 import com.fdkankan.manage.mapper.IDownloadOrderMapper;
 import com.fdkankan.manage.service.IDownloadOrderService;
@@ -33,13 +34,14 @@ public class DownloadOrderServiceImpl extends ServiceImpl<IDownloadOrderMapper,
 
     @Override
     public PageInfo pageList(OrderParam param) {
+        CacheUtil.orderParam = param;
         Page<DownOrderVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
         return PageInfo.PageInfo(page);
     }
 
     @Override
     public void export(HttpServletRequest req, HttpServletResponse resp) {
-        OrderParam orderParam = new OrderParam();
+        OrderParam orderParam = CacheUtil.orderParam;
         orderParam.setPageNum(1);
         orderParam.setPageSize(5000);
         Page<DownOrderVo> page = this.getBaseMapper().pageList(new Page<>(orderParam.getPageNum(),orderParam.getPageSize()),orderParam);

src/main/java/com/fdkankan/manage/service/impl/IncrementOrderServiceImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.excel.ExcelWriter;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.manage.common.CacheUtil;
 import com.fdkankan.manage.entity.IncrementOrder;
 import com.fdkankan.manage.mapper.IIncrementOrderMapper;
 import com.fdkankan.manage.service.IExcelService;
@@ -33,13 +34,14 @@ public class IncrementOrderServiceImpl extends ServiceImpl<IIncrementOrderMapper
 
     @Override
     public PageInfo pageList(OrderParam param) {
+        CacheUtil.orderParam = param;
         Page<IncrementOrderVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
         return PageInfo.PageInfo(page);
     }
 
     @Override
     public void export(HttpServletRequest req, HttpServletResponse resp) {
-        OrderParam orderParam = new OrderParam();
+        OrderParam orderParam = CacheUtil.orderParam;
         orderParam.setPageNum(1);
         orderParam.setPageSize(5000);
         Page<IncrementOrderVo> page = this.getBaseMapper().pageList(new Page<>(orderParam.getPageNum(),orderParam.getPageSize()),orderParam);

src/main/java/com/fdkankan/manage/service/impl/OrderServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.response.PageInfo;
+import com.fdkankan.manage.common.CacheUtil;
 import com.fdkankan.manage.entity.Order;
 import com.fdkankan.manage.mapper.IOrderMapper;
 import com.fdkankan.manage.service.IExcelService;
@@ -42,13 +43,14 @@ public class OrderServiceImpl extends ServiceImpl<IOrderMapper, Order> implement
 
     @Override
     public PageInfo pageList(OrderParam param) {
+        CacheUtil.orderParam = param;
         Page<OrderVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
         return PageInfo.PageInfo(page);
     }
 
     @Override
     public void export(HttpServletRequest req, HttpServletResponse resp) throws Exception {
-        OrderParam param = new OrderParam();
+        OrderParam param = CacheUtil.orderParam;
         param.setPageNum(1);
         param.setPageSize(5000);
         Page<OrderVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);

src/main/java/com/fdkankan/manage/util/ExcelUtil.java

@@ -34,7 +34,7 @@ public class ExcelUtil {
             for (int cellNum=0;cellNum<= row.getLastCellNum();cellNum++){
                 Cell cell = row.getCell(cellNum);
                 if(cell != null){
-                    map.put(cellNum,cell.toString());
+                    map.put(cellNum,cell.toString().trim());
                 }
             }
             rowList.add(map);