| @@ -130,20 +130,24 @@ public class WxCUserDataController extends BaseController { | |||||
| } | } | ||||
| map.put("weekVosCount", weekVosCount); //周新增会员 | map.put("weekVosCount", weekVosCount); //周新增会员 | ||||
| //自然增长(一个月) | |||||
| String startdate = DateUtils.getTimeBefore(30, new Date()); | |||||
| String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); | |||||
| Date startDate = DateUtils.getDateFromString(startdate + " 00:00:00","yyyy-MM-dd HH:mm:ss").getTime(); | |||||
| Date endDate = DateUtils.getDateFromString(systemTime + " 23:59:59","yyyy-MM-dd HH:mm:ss").getTime(); | |||||
| dto.setStartTime(startDate); | |||||
| dto.setEndTime(endDate); | |||||
| map.put("growCount", wxCUserService.findCount(dto)); | |||||
| //导入 | |||||
| //自然增长(全部排出导入的) | |||||
| //String startdate = DateUtils.getTimeBefore(30, new Date()); | |||||
| //String systemTime = DateUtils.getSystemTime("yyyy-MM-dd"); | |||||
| //Date startDate = DateUtils.getDateFromString(startdate + " 00:00:00","yyyy-MM-dd HH:mm:ss").getTime(); | |||||
| //Date endDate = DateUtils.getDateFromString(systemTime + " 23:59:59","yyyy-MM-dd HH:mm:ss").getTime(); | |||||
| dto.setStartTime(null); | |||||
| dto.setEndTime(null); | |||||
| long growCount = wxCUserService.findCount(dto); | |||||
| map.put("growCount", growCount); | |||||
| //全部导入的 | |||||
| WxCUserBasicInfoDto wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); | WxCUserBasicInfoDto wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); | ||||
| wxCUserBasicInfoDto.setTenantId(getTenantId()); | wxCUserBasicInfoDto.setTenantId(getTenantId()); | ||||
| wxCUserBasicInfoDto.setStartTime(startDate); | |||||
| wxCUserBasicInfoDto.setEndTime(endDate); | |||||
| map.put("importCount", wxCUserBasicInfoService.findCountByFilter(wxCUserBasicInfoDto)); | |||||
| wxCUserBasicInfoDto.setStartTime(null); | |||||
| wxCUserBasicInfoDto.setEndTime(null); | |||||
| long importCount = wxCUserBasicInfoService.findCountByFilter(wxCUserBasicInfoDto); | |||||
| map.put("importCount", importCount); | |||||
| map.put("allHistoryUserCount", growCount+importCount); | |||||
| return new ResultData(map); | return new ResultData(map); | ||||
| } | } | ||||