fix:导出修改

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/StaffController.java

@@ -36,6 +36,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -465,11 +466,8 @@ public class StaffController extends WebBaseController {
      * @Description 会员导出
      */
     @RequestMapping("staff-export")
-    public HaobanResponse staffExport(HttpServletResponse response, String departmentId, Integer activeFlag, String keyWord, BasePageInfo pageInfo) {
-        int currPage = 1;
-        Page pageSearch = new Page<>();
-        pageSearch.setPageSize(200);
-        pageSearch.setCurrentPage(currPage);
+    public HaobanResponse staffExport(HttpServletRequest request, HttpServletResponse response, String departmentId, Integer activeFlag, String keyWord, BasePageInfo pageInfo) {
+        pageInfo.setPageSize(Integer.MAX_VALUE);
         List<String> departmentIdSet = new ArrayList<>();
         departmentIdSet.add(departmentId);
         LoginDTO login = (LoginDTO) AuthRequestUtil.getLoginUser();
@@ -479,18 +477,6 @@ public class StaffController extends WebBaseController {
         List<String> departmentIds = relationList.stream().map(DepartmentDTO::getDepartmentId).collect(Collectors.toList());
         Page<StaffDTO> page = staffApiService.pageStaff(departmentIds, activeFlag, keyWord, pageInfo);
         List<StaffDTO> list = page.getResult();
-        Integer totalPage = page.getTotalPage();
-        if (totalPage > 1) {
-            while (totalPage >= currPage) {
-                currPage++;
-                pageInfo.setPageNum(currPage);
-                page = staffApiService.pageStaff(departmentIds, activeFlag, keyWord, pageInfo);
-                List<StaffDTO> sonList = page.getResult();
-                if (CollectionUtils.isNotEmpty(sonList)) {
-                    list.addAll(sonList);
-                }
-            }
-        }
         List<StaffExportVO> voList = new ArrayList<>();
         for (StaffDTO staffDTO : list) {
             StaffExportVO vo = new StaffExportVO();
@@ -510,10 +496,10 @@ public class StaffController extends WebBaseController {
         }
         mergeClerkInfo(voList, wxEnterpriseId);
         String fileName = wxEnterpriseName + "通讯录" + DateUtil.dateToStr(new Date(), DateUtil.FORMAT_DATE_8);
-        List<String> fileList = Arrays.asList("姓名", "职务", "部门", "手机号", "使用状态", "关联导购");
-        List<String> titleList = Arrays.asList("staffName", "position", "departmentName", "phoneNumber", "activeFlag", "clerkName");
+        List<String> titleList = Arrays.asList("姓名", "职务", "部门", "手机号", "使用状态", "关联导购");
+        List<String> fileList = Arrays.asList("staffName", "position", "departmentName", "phoneNumber", "activeFlag", "clerkName");
         try {
-            ExcelUtils.csv(response, null, fileName, voList, fileList, titleList);
+            ExcelUtils.xls(response, request, fileName, voList, fileList, titleList);
         } catch (Exception e) {
             e.printStackTrace();
             logger.info("导出失败");