|
@@ -199,15 +199,15 @@ public class SettlementFileInfoServiceImpl extends ServiceImpl<SettlementFileInf
|
|
public Result getAccountNumAndImgNum(SettlementFileParamsVo paramsVo, SysUser user) {
|
|
public Result getAccountNumAndImgNum(SettlementFileParamsVo paramsVo, SysUser user) {
|
|
Map<String,String> map = settlementFileInfoMapper.getAccountNumAndImgNum(paramsVo);
|
|
Map<String,String> map = settlementFileInfoMapper.getAccountNumAndImgNum(paramsVo);
|
|
List<String>accountIds = reportSettlementService.getAccountId(paramsVo,user);
|
|
List<String>accountIds = reportSettlementService.getAccountId(paramsVo,user);
|
|
- //过滤消耗为0 的账户 1-头条 2-快手
|
|
|
|
- if (paramsVo.getMediaId().equals(1)){
|
|
|
|
- accountIds = reportSettlementMapper.getAccountIdBytedanceRepeat(accountIds,paramsVo.getUploadYears());
|
|
|
|
- }else if (paramsVo.getMediaId().equals(2)){
|
|
|
|
- accountIds = reportSettlementMapper.getAccountIdKuaiShouRepeat(accountIds,paramsVo.getUploadYears());
|
|
|
|
- }
|
|
|
|
- if(null == accountIds||accountIds.isEmpty()){
|
|
|
|
|
|
+ if (Check.isNull(accountIds)){
|
|
map.put("accountNum","0");
|
|
map.put("accountNum","0");
|
|
- }else{
|
|
|
|
|
|
+ }else {
|
|
|
|
+ //过滤消耗为0 的账户 1-头条 2-快手
|
|
|
|
+ if (paramsVo.getMediaId().equals(1)){
|
|
|
|
+ accountIds = reportSettlementMapper.getAccountIdBytedanceRepeat(accountIds,paramsVo.getUploadYears());
|
|
|
|
+ }else if (paramsVo.getMediaId().equals(2)){
|
|
|
|
+ accountIds = reportSettlementMapper.getAccountIdKuaiShouRepeat(accountIds,paramsVo.getUploadYears());
|
|
|
|
+ }
|
|
map.put("accountNum",accountIds.size()+"");
|
|
map.put("accountNum",accountIds.size()+"");
|
|
}
|
|
}
|
|
return Result.successMsg("查询账户数量以及图片数量成功",map);
|
|
return Result.successMsg("查询账户数量以及图片数量成功",map);
|