111

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

@@ -149,16 +149,13 @@ private static Logger logger = LoggerFactory.getLogger(MaidianDataController.cla
     @RequestMapping("/export-activite-list")
     public HaobanResponse exportActiviteList(HttpServletRequest request,HttpServletResponse response,MemberAnalyzeParamsDTO paramsDTO) {
     	paramsDTO.setWebFlag(1);
-        Map<String, Object> returnMap = new HashMap<String, Object>();
-        List<HaobanLoginInfoDTO> resultList = new ArrayList<HaobanLoginInfoDTO>();
         paramsDTO.setCurrentPage(1);
         paramsDTO.setPageSize(Integer.MAX_VALUE);
         Page<HaobanClerkLoginDTO> page= maidianDataService.pageActiviteList(paramsDTO);
-    	resultList = EntityUtil.changeEntityListByJSON(HaobanLoginInfoDTO.class, page);
 		List<String> titleList = Arrays.asList( "导购姓名","导购代码","归属门店","最后登陆时间","激活状态");
 		List<String> fileList = Arrays.asList("clerkName", "clerkCode", "storeName", "lastLoginTime", "activationStatus");
 		try {
-			ExcelUtils.xls(response, request, "详情报表", resultList, fileList, titleList);
+			ExcelUtils.xls(response, request, "详情报表", page.getList(), fileList, titleList);
 		} catch (Exception e) {
             logger.info(e.getMessage(),e);
 		}
@@ -183,7 +180,7 @@ private static Logger logger = LoggerFactory.getLogger(MaidianDataController.cla
 		List<String> titleList = Arrays.asList( "导购姓名","导购代码","归属门店","最后登陆时间","登陆次数","平均访问总时长");
 		List<String> fileList = Arrays.asList("clerkName", "clerkCode", "storeName", "lastLoginTime", "loginTimes", "avgVisitTime");
 		try {
-			ExcelUtils.xls(response, request, "详情报表", page.getResult(), fileList, titleList);
+			ExcelUtils.xls(response, request, "详情报表", page.getList(), fileList, titleList);
 		} catch (Exception e) {
             logger.info(e.getMessage(),e);
 		}