Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

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

 package com.gic.haoban.manage.web.controller;
 
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -60,13 +62,22 @@ private static Logger logger = LoggerFactory.getLogger(MaidianDataController.cla
         if(dto == null){
         	return resultResponse(HaoBanErrCode.ERR_1,returnMap);
         }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        paramsDTO.setStartDate(sdf.format(new Date()));
+        AdsGicLogHaobanStoreLoginDDTO today = maidianDataService.totalActivationData(paramsDTO);
+        if(today == null){
+        	today = new AdsGicLogHaobanStoreLoginDDTO();
+        }
         returnMap.put("loginClerkCnt", dto.getLoginClerkCnt()) ;
         returnMap.put("activeClerkCnt", dto.getActiveClerkCnt()) ;
         returnMap.put("loginClerkTimes", dto.getLoginClerkTimes()) ;
         returnMap.put("notActiveClerkCnt", dto.getNotActiveClerkCnt()) ;
         returnMap.put("totalClerkCnt", dto.getTotalClerkCnt()) ;
         returnMap.put("notLoginClerkCnt", dto.getNotLoginClerkCnt()) ;
-        returnMap.put("stayTime", dto.getStayTime()) ;
+        returnMap.put("avgLoginTimes", dto.getLoginClerkTimes()/dto.getLoginClerkCnt()) ;
+        returnMap.put("avgVisitTime", dto.getStayTime()/dto.getLoginClerkCnt()) ;
+        returnMap.put("toDayLoginClerkCnt", today.getLoginClerkCnt()) ;
+
     	return resultResponse(HaoBanErrCode.ERR_1,returnMap);
     }
     //首页-好办登陆信息总人数概况