修改导出功能

rankin-cms-web/src/main/java/cn/rankin/cmsweb/controller/stmt/StmtCampusController.java

@@ -3,7 +3,6 @@ package cn.rankin.cmsweb.controller.stmt;
 import cn.rankin.cmsweb.assist.resolver.NeedUser;
 import cn.rankin.cmsweb.entity.UserDetails;
 import cn.rankin.cmsweb.service.stmt.StmtCampusService;
-import cn.rankin.cmsweb.service.user.CampusService;
 import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.page.Page;
 import cn.rankin.common.utils.util.BeanUtil;
@@ -77,6 +76,20 @@ public class StmtCampusController
             String merchantId = user.getMerchantId();
             campusSearchDTO.setMerchantId(merchantId);
         }
+
+        //不是条件查询就全部下载
+        String code = campusSearchDTO.getCode();
+        String name = campusSearchDTO.getName();
+        if ((code != null && code != "") || (name != null && name != ""))
+        {
+
+        }
+        else
+        {
+            campusSearchDTO.setPageNo(0);
+            campusSearchDTO.setPageSize(100000);
+        }
+
         APIResult<List<CampusVo>> apiResult = stmtService.query(BeanUtil.convertToMap(campusSearchDTO));
 
         List<CampusVo> list = apiResult.getData();
@@ -85,13 +98,13 @@ public class StmtCampusController
         //建立新的sheet对象（excel的表单）
         HSSFSheet sheet = wb.createSheet("已开通校区报表");
         //设置单元格宽度
-        sheet.setColumnWidth(0,50*256);
-        sheet.setColumnWidth(1,10*256);
-        sheet.setColumnWidth(2,10*256);
-        sheet.setColumnWidth(3,30*256);
-        sheet.setColumnWidth(4,10*256);
-        sheet.setColumnWidth(5,15*256);
-        sheet.setColumnWidth(6,15*256);
+        sheet.setColumnWidth(0, 50 * 256);
+        sheet.setColumnWidth(1, 10 * 256);
+        sheet.setColumnWidth(2, 10 * 256);
+        sheet.setColumnWidth(3, 30 * 256);
+        sheet.setColumnWidth(4, 10 * 256);
+        sheet.setColumnWidth(5, 15 * 256);
+        sheet.setColumnWidth(6, 15 * 256);
         //在sheet里创建第一行，参数为行索引(excel的行)，可以是0～65535之间的任何一个
         HSSFRow row1 = sheet.createRow(0);
         //创建单元格并设置单元格内容

rankin-cms-web/src/main/java/cn/rankin/cmsweb/controller/stmt/StmtStatsController.java

@@ -2,35 +2,21 @@ package cn.rankin.cmsweb.controller.stmt;
 
 import cn.rankin.cmsweb.assist.resolver.NeedUser;
 import cn.rankin.cmsweb.entity.UserDetails;
-import cn.rankin.cmsweb.service.product.ProductService;
 import cn.rankin.cmsweb.service.stmt.StmtCampusService;
-import cn.rankin.cmsweb.service.user.CampusService;
 import cn.rankin.cmsweb.service.user.TerminalUserService;
 import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.page.Page;
 import cn.rankin.common.utils.util.BeanUtil;
-import cn.rankin.common.utils.util.DateUtil;
-import cn.rankin.common.utils.util.ListUtil;
-import cn.rankin.common.utils.util.ProvinceUtil;
-import cn.rankin.data.api.product.vo.ProductVo;
 import cn.rankin.data.api.user.dto.CampusSearchDTO;
 import cn.rankin.data.api.user.dto.TerminalUserSearchDTO;
 import cn.rankin.data.api.user.vo.CampusVo;
-import cn.rankin.data.api.user.vo.TerminalUserAuthVo;
 import cn.rankin.data.api.user.vo.TerminalUserVo;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.hssf.usermodel.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletResponse;
-import java.io.OutputStream;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
 
 @Slf4j
 @RestController

rankin-cms-web/src/main/java/cn/rankin/cmsweb/controller/stmt/StmtTerminalUserController.java

@@ -87,6 +87,15 @@ public class StmtTerminalUserController
             String merchantId = user.getMerchantId();
             searchDTO.setMerchantId(merchantId);
         }
+
+        //不是条件查询就全部下载
+        String code = searchDTO.getCode();
+        if (code == null || code == "")
+        {
+            searchDTO.setPageNo(0);
+            searchDTO.setPageSize(100000);
+        }
+
         Page<TerminalUserAuthVo> authVoPage = terminalUserService.findAuthList(BeanUtil.convertToMap(searchDTO));
 
         List<TerminalUserAuthVo> list = authVoPage.getList();
@@ -135,12 +144,11 @@ public class StmtTerminalUserController
                 row.createCell(0).setCellValue(vo.getUCode());
                 row.createCell(1).setCellValue(vo.getPCode());
                 row.createCell(2).setCellValue(vo.getPName());
-                row.createCell(3).setCellValue(vo.getStartTime());
-                row.createCell(4).setCellValue(vo.getEndTime());
+                row.createCell(3).setCellValue(DateUtil.parseDateStr(vo.getStartTime()));
+                row.createCell(4).setCellValue(DateUtil.parseDateStr(vo.getEndTime()));
                 row.createCell(5).setCellValue(vo.getCampusContactName());
                 row.createCell(6).setCellValue(vo.getCampusContactWay());
                 row.createCell(7).setCellValue(vo.getCampusName());
-
             }
         }