111

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

@@ -187,15 +187,26 @@ private static Logger logger = LoggerFactory.getLogger(MaidianDataController.cla
         paramsDTO.setPageSize(Integer.MAX_VALUE);
         Map<String, Object> returnMap = new HashMap<String, Object>();
         Page<HaobanClerkLoginDTO> page= maidianDataService.pageClerkLogin(paramsDTO);
-		List<String> titleList = Arrays.asList( "导购姓名","导购代码","归属门店","最后登陆时间","登陆次数","平均访问总时长");
-		List<String> fileList = Arrays.asList("clerkName", "clerkCode", "storeName", "lastLoginTime", "loginTimes", "avgVisitTime");
-		try {
-			ExcelUtils.xls(response, request, "详情报表", page.getList(), fileList, titleList);
-		} catch (Exception e) {
-            logger.info(e.getMessage(),e);
+		if(paramsDTO.getLoginStatus() == 1){
+			//已登陆
+	        try {
+				List<String> titleList = Arrays.asList( "导购姓名","导购代码","归属门店","最后登陆时间","登陆次数","平均访问总时长");
+				List<String> fileList = Arrays.asList("clerkName", "clerkCode", "storeName", "lastLoginTime", "loginTimes", "avgVisitTime");
+				ExcelUtils.xls(response, request, "详情报表", page.getList(), fileList, titleList);
+			} catch (Exception e) {
+	            logger.info(e.getMessage(),e);
+			}
+		}else{
+			//未登陆
+	        try {
+				List<String> titleList = Arrays.asList( "导购姓名","导购代码","归属门店","最后登陆时间");
+				List<String> fileList = Arrays.asList("clerkName", "clerkCode", "storeName", "lastLoginTime");
+				ExcelUtils.xls(response, request, "详情报表", page.getList(), fileList, titleList);
+			} catch (Exception e) {
+	            logger.info(e.getMessage(),e);
+			}
 		}
-        returnMap.put("result", page) ;
-    	return resultResponse(HaoBanErrCode.ERR_1,returnMap);
+    	return resultResponse(HaoBanErrCode.ERR_1);
     }
     //登陆明细-明细列表
     @RequestMapping("/login-detail-list")