|
|
|
@@ -518,29 +518,19 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc |
|
|
|
@Override |
|
|
|
public long countByFilter(TenantEntity tenantEntity, List<WxCUserBasicInfoFilterDto> filterList) { |
|
|
|
WxCUserBasicInfoDto wxCUserBasicInfoDto = filtersToDto(tenantEntity, filterList); |
|
|
|
if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ |
|
|
|
//关联微信表查询 |
|
|
|
return wxCUserBasicInfoMapper.findCountByFilter1(tenantEntity,wxCUserBasicInfoDto); |
|
|
|
}else{ |
|
|
|
//直接查询本表 |
|
|
|
wxCUserBasicInfoDto.setTenantId(tenantEntity.getFinalTenantId()); |
|
|
|
wxCUserBasicInfoDto.setFinalTenantId(tenantEntity.getFinalTenantId()); |
|
|
|
return wxCUserBasicInfoMapper.findCountByFilter(wxCUserBasicInfoDto); |
|
|
|
} |
|
|
|
|
|
|
|
wxCUserBasicInfoDto.setTenantId(tenantEntity.getFinalTenantId()); |
|
|
|
wxCUserBasicInfoDto.setFinalTenantId(tenantEntity.getFinalTenantId()); |
|
|
|
return wxCUserBasicInfoMapper.findCountByFilter(wxCUserBasicInfoDto); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<WxCUserBasicInfo> listByFilter(TenantEntity tenantEntity, List<WxCUserBasicInfoFilterDto> filterList) { |
|
|
|
WxCUserBasicInfoDto wxCUserBasicInfoDto = filtersToDto(tenantEntity, filterList); |
|
|
|
if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ |
|
|
|
//关联微信表查询 |
|
|
|
return wxCUserBasicInfoMapper.findListByFilter1(tenantEntity,wxCUserBasicInfoDto); |
|
|
|
}else{ |
|
|
|
//直接查询本表 |
|
|
|
wxCUserBasicInfoDto.setTenantId(tenantEntity.getFinalTenantId()); |
|
|
|
wxCUserBasicInfoDto.setFinalTenantId(tenantEntity.getFinalTenantId()); |
|
|
|
return wxCUserBasicInfoMapper.findListByFilter(wxCUserBasicInfoDto); |
|
|
|
} |
|
|
|
|
|
|
|
wxCUserBasicInfoDto.setTenantId(tenantEntity.getFinalTenantId()); |
|
|
|
wxCUserBasicInfoDto.setFinalTenantId(tenantEntity.getFinalTenantId()); |
|
|
|
return wxCUserBasicInfoMapper.findListByFilter(wxCUserBasicInfoDto); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@@ -576,14 +566,9 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc |
|
|
|
|
|
|
|
@Override |
|
|
|
public PageInfo<WxCUserBasicInfo> listAsPage(TenantEntity tenantInfo, WxCUserBasicInfo wxCUserBasicInfo, Integer pageIndex, Integer pageSize) { |
|
|
|
if(StringUtils.isNotBlank(tenantInfo.getParentTenantId())){ |
|
|
|
//关联微信表查询 |
|
|
|
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCUserBasicInfoMapper.findList1(tenantInfo,wxCUserBasicInfo)); |
|
|
|
}else{ |
|
|
|
//直接查询本表 |
|
|
|
wxCUserBasicInfo.undateFinalTenantId(tenantInfo); |
|
|
|
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCUserBasicInfoMapper.findList(wxCUserBasicInfo)); |
|
|
|
} |
|
|
|
wxCUserBasicInfo.setTenantId(tenantInfo.getTenantId()); |
|
|
|
wxCUserBasicInfo.undateFinalTenantId(tenantInfo); |
|
|
|
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCUserBasicInfoMapper.findList(wxCUserBasicInfo)); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@@ -784,15 +769,9 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc |
|
|
|
|
|
|
|
@Override |
|
|
|
public long findCountBySex(TenantEntity tenantInfo, WxCUserBasicInfoDto dto) { |
|
|
|
if(StringUtils.isNotBlank(tenantInfo.getParentTenantId())){ |
|
|
|
//关联微信表查询 |
|
|
|
return wxCUserBasicInfoMapper.findCountBySex1(tenantInfo,dto); |
|
|
|
}else{ |
|
|
|
//直接查询本表 |
|
|
|
dto.setTenantId(tenantInfo.getFinalTenantId()); |
|
|
|
dto.setFinalTenantId(tenantInfo.getFinalTenantId()); |
|
|
|
return wxCUserBasicInfoMapper.findCountBySex(dto); |
|
|
|
} |
|
|
|
dto.setTenantId(tenantInfo.getTenantId()); |
|
|
|
dto.setFinalTenantId(tenantInfo.getFinalTenantId()); |
|
|
|
return wxCUserBasicInfoMapper.findCountBySex(dto); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@@ -802,15 +781,9 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc |
|
|
|
|
|
|
|
@Override |
|
|
|
public long findCountByAge(TenantEntity tenantInfo, WxCUserBasicInfoDto dto) { |
|
|
|
if(StringUtils.isNotBlank(tenantInfo.getParentTenantId())){ |
|
|
|
//关联微信表查询 |
|
|
|
return wxCUserBasicInfoMapper.findCountByAge1(tenantInfo,dto); |
|
|
|
}else{ |
|
|
|
//直接查询本表 |
|
|
|
dto.setTenantId(tenantInfo.getFinalTenantId()); |
|
|
|
dto.setFinalTenantId(tenantInfo.getFinalTenantId()); |
|
|
|
return wxCUserBasicInfoMapper.findCountByAge(dto); |
|
|
|
} |
|
|
|
dto.setTenantId(tenantInfo.getTenantId()); |
|
|
|
dto.setFinalTenantId(tenantInfo.getFinalTenantId()); |
|
|
|
return wxCUserBasicInfoMapper.findCountByAge(dto); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@@ -820,15 +793,9 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc |
|
|
|
|
|
|
|
@Override |
|
|
|
public long findCountByScore(TenantEntity tenantInfo, WxCUserBasicInfoDto dto) { |
|
|
|
if(StringUtils.isNotBlank(tenantInfo.getParentTenantId())){ |
|
|
|
//关联微信表查询 |
|
|
|
return wxCUserBasicInfoMapper.findCountByScore1(tenantInfo,dto); |
|
|
|
}else{ |
|
|
|
//直接查询本表 |
|
|
|
dto.setTenantId(tenantInfo.getFinalTenantId()); |
|
|
|
dto.setFinalTenantId(tenantInfo.getFinalTenantId()); |
|
|
|
return wxCUserBasicInfoMapper.findCountByScore(dto); |
|
|
|
} |
|
|
|
dto.setTenantId(tenantInfo.getTenantId()); |
|
|
|
dto.setFinalTenantId(tenantInfo.getFinalTenantId()); |
|
|
|
return wxCUserBasicInfoMapper.findCountByScore(dto); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@@ -838,14 +805,9 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc |
|
|
|
|
|
|
|
@Override |
|
|
|
public int exportDataCount(TenantEntity tenantInfo, WxCUserBasicInfo basicInfo) { |
|
|
|
if(StringUtils.isNotBlank(tenantInfo.getParentTenantId())){ |
|
|
|
//关联微信表查询 |
|
|
|
return wxCUserBasicInfoMapper.countVoList1(tenantInfo,basicInfo); |
|
|
|
}else{ |
|
|
|
//直接查询本表 |
|
|
|
basicInfo.undateFinalTenantId(tenantInfo); |
|
|
|
return wxCUserBasicInfoMapper.countVoList(basicInfo); |
|
|
|
} |
|
|
|
basicInfo.setTenantId(tenantInfo.getTenantId()); |
|
|
|
basicInfo.undateFinalTenantId(tenantInfo); |
|
|
|
return wxCUserBasicInfoMapper.countVoList(basicInfo); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@@ -1223,15 +1185,9 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc |
|
|
|
|
|
|
|
@Override |
|
|
|
public long findCount(TenantEntity tenantInfo, WxCUserBasicInfoDto dto) { |
|
|
|
if(StringUtils.isNotBlank(tenantInfo.getParentTenantId())){ |
|
|
|
//关联微信表查询 |
|
|
|
return wxCUserBasicInfoMapper.findCount1(tenantInfo,dto); |
|
|
|
}else{ |
|
|
|
//直接查询本表 |
|
|
|
dto.setTenantId(tenantInfo.getFinalTenantId()); |
|
|
|
dto.setFinalTenantId(tenantInfo.getFinalTenantId()); |
|
|
|
return wxCUserBasicInfoMapper.findCount(dto); |
|
|
|
} |
|
|
|
dto.setTenantId(tenantInfo.getTenantId()); |
|
|
|
dto.setFinalTenantId(tenantInfo.getFinalTenantId()); |
|
|
|
return wxCUserBasicInfoMapper.findCount(dto); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@@ -1241,15 +1197,9 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<UserCountVo> findCountHistory(TenantEntity tenantInfo, WxCUserBasicInfoDto dto) { |
|
|
|
if(StringUtils.isNotBlank(tenantInfo.getParentTenantId())){ |
|
|
|
//关联微信表查询 |
|
|
|
return wxCUserBasicInfoMapper.findCountHistory1(tenantInfo,dto); |
|
|
|
}else{ |
|
|
|
//直接查询本表 |
|
|
|
dto.setTenantId(tenantInfo.getFinalTenantId()); |
|
|
|
dto.setFinalTenantId(tenantInfo.getFinalTenantId()); |
|
|
|
return wxCUserBasicInfoMapper.findCountHistory(dto); |
|
|
|
} |
|
|
|
dto.setTenantId(tenantInfo.getTenantId()); |
|
|
|
dto.setFinalTenantId(tenantInfo.getFinalTenantId()); |
|
|
|
return wxCUserBasicInfoMapper.findCountHistory(dto); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@@ -1261,17 +1211,12 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc |
|
|
|
|
|
|
|
@Override |
|
|
|
public long findGrowUserCount(TenantEntity tenantEntity) { |
|
|
|
String tenantId = tenantEntity.getTenantId(); |
|
|
|
String finalTenantId = tenantEntity.getTenantId(); |
|
|
|
if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ |
|
|
|
//关联微信表查询 |
|
|
|
return wxCUserBasicInfoMapper.findGrowUserCount1(tenantEntity.getTenantId(),tenantEntity.getFinalTenantId()); |
|
|
|
}else{ |
|
|
|
//直接查询本表 |
|
|
|
String finalTenantId = tenantEntity.getTenantId(); |
|
|
|
if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ |
|
|
|
finalTenantId = tenantEntity.getParentTenantId(); |
|
|
|
} |
|
|
|
return wxCUserBasicInfoMapper.findGrowUserCount(finalTenantId); |
|
|
|
finalTenantId = tenantEntity.getParentTenantId(); |
|
|
|
} |
|
|
|
return wxCUserBasicInfoMapper.findGrowUserCount(tenantId,finalTenantId); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@@ -1309,30 +1254,19 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<WxCUserBasicInfo> findListByScore(TenantEntity tenantEntity, WxCUserBasicInfoDto wxCUserBasicInfoDto) { |
|
|
|
if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ |
|
|
|
//关联微信表查询 |
|
|
|
return wxCUserBasicInfoMapper.findListByScore1(tenantEntity,wxCUserBasicInfoDto); |
|
|
|
}else{ |
|
|
|
//直接查询本表 |
|
|
|
wxCUserBasicInfoDto.setTenantId(tenantEntity.getFinalTenantId()); |
|
|
|
wxCUserBasicInfoDto.setFinalTenantId(tenantEntity.getFinalTenantId()); |
|
|
|
return wxCUserBasicInfoMapper.findListByScore(wxCUserBasicInfoDto); |
|
|
|
} |
|
|
|
wxCUserBasicInfoDto.setTenantId(tenantEntity.getTenantId()); |
|
|
|
wxCUserBasicInfoDto.setFinalTenantId(tenantEntity.getFinalTenantId()); |
|
|
|
return wxCUserBasicInfoMapper.findListByScore(wxCUserBasicInfoDto); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<WxCUserBasicInfo> findBirthdayList(TenantEntity tenantEntity, String format, String format1) { |
|
|
|
String tenantId = tenantEntity.getTenantId(); |
|
|
|
String finalTenantId = tenantEntity.getTenantId(); |
|
|
|
if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ |
|
|
|
//关联微信表查询 |
|
|
|
return wxCUserBasicInfoMapper.findBirthdayList1(tenantEntity.getFinalTenantId(),tenantEntity.getTenantId(),tenantEntity.getParentTenantId(),format,format1); |
|
|
|
}else{ |
|
|
|
//直接查询本表 |
|
|
|
String finalTenantId = tenantEntity.getTenantId(); |
|
|
|
if(StringUtils.isNotBlank(tenantEntity.getParentTenantId())){ |
|
|
|
finalTenantId = tenantEntity.getParentTenantId(); |
|
|
|
} |
|
|
|
return wxCUserBasicInfoMapper.findBirthdayList(finalTenantId,format,format1); |
|
|
|
finalTenantId = tenantEntity.getParentTenantId(); |
|
|
|
} |
|
|
|
return wxCUserBasicInfoMapper.findBirthdayList(tenantId,finalTenantId,format,format1); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@@ -1352,13 +1286,10 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc |
|
|
|
List<WxCUserBasicInfoVo> list = new ArrayList<WxCUserBasicInfoVo>(); |
|
|
|
basicInfo.setBegin((page-1)*20000); |
|
|
|
basicInfo.setLimit(20000); |
|
|
|
// if(StringUtils.isNotBlank(tenantInfo.getParentTenantId())){ |
|
|
|
// //list = wxCUserBasicInfoMapper.findVoList1(tenantInfo,basicInfo); |
|
|
|
// }else{ |
|
|
|
// basicInfo.undateFinalTenantId(tenantInfo); |
|
|
|
// } |
|
|
|
|
|
|
|
list = wxCUserBasicInfoMapper.findVoList1(tenantInfo,basicInfo); |
|
|
|
basicInfo.undateFinalTenantId(tenantInfo); |
|
|
|
basicInfo.undateFinalTenantId(tenantInfo); |
|
|
|
list = wxCUserBasicInfoMapper.findVoList(basicInfo); |
|
|
|
if (null == list || list.size() <= 0 ) { |
|
|
|
return null; |
|
|
|
} |
|
|
|
|