|
@@ -11,6 +11,7 @@ import org.jeecg.common.system.vo.LoginUser;
|
|
|
import org.jeecg.ctop.finance.policy.utils.Check;
|
|
|
import org.jeecg.ctop.finance.settlement.entity.pojo.CtopCwjsSettlementFileInfo;
|
|
|
import org.jeecg.ctop.finance.settlement.entity.vo.SettlementFileParamsVo;
|
|
|
+import org.jeecg.ctop.finance.settlement.mapper.ReportSettlementMapper;
|
|
|
import org.jeecg.ctop.finance.settlement.mapper.SettlementFileInfoMapper;
|
|
|
import org.jeecg.ctop.finance.settlement.mapper.SettlementInfoMapper;
|
|
|
import org.jeecg.ctop.finance.settlement.service.IReportSettlementService;
|
|
@@ -185,6 +186,8 @@ public class SettlementFileInfoServiceImpl extends ServiceImpl<SettlementFileInf
|
|
|
|
|
|
@Autowired
|
|
|
private IReportSettlementService reportSettlementService;
|
|
|
+ @Autowired
|
|
|
+ private ReportSettlementMapper reportSettlementMapper;
|
|
|
|
|
|
/**
|
|
|
* @description: 查询账户数量以及图片数量
|
|
@@ -196,6 +199,12 @@ public class SettlementFileInfoServiceImpl extends ServiceImpl<SettlementFileInf
|
|
|
public Result getAccountNumAndImgNum(SettlementFileParamsVo paramsVo, SysUser user) {
|
|
|
Map<String,String> map = settlementFileInfoMapper.getAccountNumAndImgNum(paramsVo);
|
|
|
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()){
|
|
|
map.put("accountNum","0");
|
|
|
}else{
|