|
|
|
@@ -130,24 +130,20 @@ public class WxCUserDataController extends BaseController { |
|
|
|
} |
|
|
|
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(null); |
|
|
|
dto.setEndTime(null); |
|
|
|
long growCount = wxCUserService.findCount(dto); |
|
|
|
map.put("growCount", growCount); |
|
|
|
//全部导入的 |
|
|
|
WxCUserBasicInfoDto wxCUserBasicInfoDto = new WxCUserBasicInfoDto(); |
|
|
|
wxCUserBasicInfoDto.setTenantId(getTenantId()); |
|
|
|
wxCUserBasicInfoDto.setStartTime(null); |
|
|
|
wxCUserBasicInfoDto.setEndTime(null); |
|
|
|
long importCount = wxCUserBasicInfoService.findCount(wxCUserBasicInfoDto); |
|
|
|
map.put("importCount", importCount); |
|
|
|
map.put("allHistoryUserCount", growCount+importCount); |
|
|
|
|
|
|
|
map.put("growCount", wxCUserBasicInfoService.findGrowUserCount(wxCUserBasicInfoDto)); |
|
|
|
//全部导入的 |
|
|
|
map.put("importCount", wxCUserBasicInfoService.findImportUserCount(wxCUserBasicInfoDto)); |
|
|
|
//全部 |
|
|
|
map.put("allHistoryUserCount", wxCUserBasicInfoService.findCount(wxCUserBasicInfoDto)); |
|
|
|
return new ResultData(map); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -352,3 +348,4 @@ public class WxCUserDataController extends BaseController { |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|