111

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

 package com.gic.haoban.manage.web.controller;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -12,6 +16,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import cn.hutool.core.date.DateUtil;
+
 import com.gic.cloud.common.api.base.Page;
 import com.gic.cloud.data.api.dto.AdsGicLogHaobanStoreIntervalLoginDDTO;
 import com.gic.cloud.data.api.dto.AdsGicLogHaobanStoreLoginDDTO;
@@ -23,6 +29,7 @@ import com.gic.cloud.data.api.service.MaidianDataService;
 import com.gic.cloud.web.service.api.dto.CloudStoreGroupDTO;
 import com.gic.cloud.web.service.api.service.CloudStoreGroupService;
 import com.gic.commons.util.EntityUtil;
+import com.gic.haoban.common.utils.ExcelUtils;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 
@@ -50,6 +57,9 @@ private static Logger logger = LoggerFactory.getLogger(MaidianDataController.cla
     	paramsDTO.setWebFlag(1);
         Map<String, Object> returnMap = new HashMap<String, Object>();
         AdsGicLogHaobanStoreLoginDDTO dto = maidianDataService.totalActivationData(paramsDTO);
+        if(dto == null){
+        	return resultResponse(HaoBanErrCode.ERR_1,returnMap);
+        }
         returnMap.put("loginClerkCnt", dto.getLoginClerkCnt()) ;
         returnMap.put("activeClerkCnt", dto.getActiveClerkCnt()) ;
         returnMap.put("loginClerkTimes", dto.getLoginClerkTimes()) ;
@@ -111,13 +121,12 @@ private static Logger logger = LoggerFactory.getLogger(MaidianDataController.cla
         List<HaobanLoginInfoDTO> resultList = new ArrayList<HaobanLoginInfoDTO>();
         Page<HaobanClerkLoginDTO> page= maidianDataService.pageActiviteList(paramsDTO);
     	resultList = EntityUtil.changeEntityListByJSON(HaobanLoginInfoDTO.class, page);
-        returnMap.put("result", resultList) ;
-    	return resultResponse(HaoBanErrCode.ERR_1,returnMap);
+    	return resultResponse(HaoBanErrCode.ERR_1,page);
 
     }
     //导出-激活明细-激活列表
     @RequestMapping("/export-activite-list")
-    public HaobanResponse exportActiviteList(MemberAnalyzeParamsDTO paramsDTO,int datesType) {
+    public HaobanResponse exportActiviteList(HttpServletRequest request,HttpServletResponse response,MemberAnalyzeParamsDTO paramsDTO,int datesType) {
     	paramsDTO.setWebFlag(1);
         Map<String, Object> returnMap = new HashMap<String, Object>();
         List<HaobanLoginInfoDTO> resultList = new ArrayList<HaobanLoginInfoDTO>();
@@ -125,9 +134,14 @@ private static Logger logger = LoggerFactory.getLogger(MaidianDataController.cla
         paramsDTO.setPageSize(Integer.MAX_VALUE);
         Page<HaobanClerkLoginDTO> page= maidianDataService.pageActiviteList(paramsDTO);
     	resultList = EntityUtil.changeEntityListByJSON(HaobanLoginInfoDTO.class, page);
-        returnMap.put("result", resultList) ;
-    	return resultResponse(HaoBanErrCode.ERR_1,returnMap);
-
+		List<String> titleList = Arrays.asList( "导购姓名","导购代码","归属门店","最后登陆时间","激活状态");
+		List<String> fileList = Arrays.asList("clerkName", "clerkCode", "storeName", "lastLoginTime", "activationStatus");
+		try {
+			ExcelUtils.xls(response, request, "详情报表", resultList, fileList, titleList);
+		} catch (Exception e) {
+            logger.info(e.getMessage(),e);
+		}
+        return resultResponse(HaoBanErrCode.ERR_1);
     }
     //登陆明细-明细列表
     @RequestMapping("/login-detail-list")