|
@@ -293,6 +293,11 @@ public class CwjsPolicyInfoServiceImpl extends ServiceImpl<CwjsPolicyInfoMapper,
|
|
//查询账户数量
|
|
//查询账户数量
|
|
List<String>accountIds = reportSettlementService.getAccountId(paramsVo,user);
|
|
List<String>accountIds = reportSettlementService.getAccountId(paramsVo,user);
|
|
|
|
|
|
|
|
+ if (Check.isNull(accountIds)){
|
|
|
|
+ return Result.errorMsg("未上传结算单账户列表查询为空。");
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
//过滤消耗为0 的账户 1-头条 2-快手
|
|
//过滤消耗为0 的账户 1-头条 2-快手
|
|
if (paramsVo.getMediaId().equals(1)){
|
|
if (paramsVo.getMediaId().equals(1)){
|
|
accountIds = reportSettlementMapper.getAccountIdBytedanceRepeat(accountIds,paramsVo.getUploadYears());
|
|
accountIds = reportSettlementMapper.getAccountIdBytedanceRepeat(accountIds,paramsVo.getUploadYears());
|
|
@@ -303,9 +308,7 @@ public class CwjsPolicyInfoServiceImpl extends ServiceImpl<CwjsPolicyInfoMapper,
|
|
//过滤以上传的账户
|
|
//过滤以上传的账户
|
|
//List<JSONObject> list = policyInfoMapper.getSettlementNoPictureAccountList(productId,projectId,uploadYears,mediaIds);
|
|
//List<JSONObject> list = policyInfoMapper.getSettlementNoPictureAccountList(productId,projectId,uploadYears,mediaIds);
|
|
|
|
|
|
- if (Check.isNull(accountIds)){
|
|
|
|
- return Result.errorMsg("未上传结算单账户列表查询为空。");
|
|
|
|
- }
|
|
|
|
|
|
+
|
|
|
|
|
|
PageHelper.startPage(paramsVo.getPageNo(), paramsVo.getPageSize());
|
|
PageHelper.startPage(paramsVo.getPageNo(), paramsVo.getPageSize());
|
|
List<JSONObject> list = policyInfoMapper.getSettlementNoPictureAccountAgentList(paramsVo.getProductId(),paramsVo.getProjectId(),paramsVo.getUploadYears(),accountIds);
|
|
List<JSONObject> list = policyInfoMapper.getSettlementNoPictureAccountAgentList(paramsVo.getProductId(),paramsVo.getProjectId(),paramsVo.getUploadYears(),accountIds);
|