|
@@ -117,6 +117,8 @@ public class CreateSheetServiceImpl implements ICreateSheetService {
|
|
|
cell.setCellStyle(style);
|
|
|
sheet.autoSizeColumn(0, true);
|
|
|
List<SheetBytedanceVo> resultList = new ArrayList<>(accountIdList.size());
|
|
|
+ //获取当前年月的 第一天 和 最后一天
|
|
|
+ Map<String,String> timeMap = SettlementUtil.getFirstAndLastDayOfMonth(uploadYears);
|
|
|
//查看账户数据
|
|
|
List<Map<String,Object>> list = reportSettlementMapper.getAccountTransactionDayBytedanceSheet(accountIdList,uploadYears);
|
|
|
for (Map<String,Object> map : list) {
|
|
@@ -130,7 +132,7 @@ public class CreateSheetServiceImpl implements ICreateSheetService {
|
|
|
List<String> policyDaysList = new ArrayList<>();
|
|
|
if (!Check.isNull(map.get("productName"))){
|
|
|
//查询 头条利润表 返点类型和比列
|
|
|
- List<Map<String,Object>> rateMap = reportSettlementMapper.getProfitBytedance(map.get("advertiserName")+"",map.get("productName")+"",null,"1",uploadYears+"-01",uploadYears+"-31");
|
|
|
+ List<Map<String,Object>> rateMap = reportSettlementMapper.getProfitBytedance(map.get("advertiserName")+"",map.get("productName")+"",null,"1",timeMap.get("startTime"),timeMap.get("endTime"));
|
|
|
List listPolicyTIme = new ArrayList();
|
|
|
for (Map<String, Object> rate : rateMap) {
|
|
|
listPolicyTIme.add(rate.get("policyStartDate"));
|
|
@@ -187,7 +189,7 @@ public class CreateSheetServiceImpl implements ICreateSheetService {
|
|
|
|
|
|
//不使用政策 的时间段
|
|
|
// 获取两个日期之间 所有的 时间 年-月-日
|
|
|
- List<String> betweenDaysList = SettlementUtil.getAllDatesOfTwoTimes(uploadYears+"-01",uploadYears+"-31");
|
|
|
+ List<String> betweenDaysList = SettlementUtil.getAllDatesOfTwoTimes(timeMap.get("startTime"),timeMap.get("endTime"));
|
|
|
// 时间差集(所有时间段 - 使用政策的时间段)
|
|
|
List<String> reduceList = betweenDaysList.stream().filter(item -> !policyDaysList.contains(item)).collect(Collectors.toList());
|
|
|
//差集拼接 开始 和 结束时间
|
|
@@ -332,7 +334,9 @@ public class CreateSheetServiceImpl implements ICreateSheetService {
|
|
|
|
|
|
List<SheetKuaiShouVo> resultList = new ArrayList<>(accountIdList.size());
|
|
|
//查询该时段 快手 数据
|
|
|
- List<Map<String,Object>> accountList = reportSettlementMapper.getProfitKuaiShouAccountCostSheet(accountIdList,uploadYears+"-01",uploadYears+"-31");
|
|
|
+ //获取当前年月的 第一天 和 最后一天
|
|
|
+ Map<String,String> timeMap = SettlementUtil.getFirstAndLastDayOfMonth(uploadYears);
|
|
|
+ List<Map<String,Object>> accountList = reportSettlementMapper.getProfitKuaiShouAccountCostSheet(accountIdList,timeMap.get("startTime"),timeMap.get("endTime"));
|
|
|
for (Map<String,Object> map : accountList) {
|
|
|
SheetKuaiShouVo voSource = new SheetKuaiShouVo();
|
|
|
voSource.setAccountId(map.get("accountId")+"");
|
|
@@ -343,7 +347,7 @@ public class CreateSheetServiceImpl implements ICreateSheetService {
|
|
|
List<String> policyDaysList = new ArrayList<>();
|
|
|
if (!Check.isNull(map.get("productName"))) {
|
|
|
//查询 快手利润表 返点类型和比列
|
|
|
- List<Map<String, Object>> rateMap = reportSettlementMapper.getProfitBytedance(map.get("advertiserName")+"",map.get("productName") + "", null,"2", uploadYears+"-01",uploadYears+"-31");
|
|
|
+ List<Map<String, Object>> rateMap = reportSettlementMapper.getProfitBytedance(map.get("advertiserName")+"",map.get("productName") + "", null,"2", timeMap.get("startTime"),timeMap.get("endTime"));
|
|
|
List listPolicyTIme = new ArrayList();
|
|
|
for (Map<String, Object> rate : rateMap) {
|
|
|
listPolicyTIme.add(rate.get("policyStartDate"));
|
|
@@ -406,7 +410,7 @@ public class CreateSheetServiceImpl implements ICreateSheetService {
|
|
|
|
|
|
//不使用政策 的时间段
|
|
|
// 获取两个日期之间 所有的 时间 年-月-日
|
|
|
- List<String> betweenDaysList = SettlementUtil.getAllDatesOfTwoTimes(uploadYears+"-01",uploadYears+"-31");
|
|
|
+ List<String> betweenDaysList = SettlementUtil.getAllDatesOfTwoTimes(timeMap.get("startTime"),timeMap.get("endTime"));
|
|
|
// 时间差集(所有时间段 - 使用政策的时间段)
|
|
|
List<String> reduceList = betweenDaysList.stream().filter(item -> !policyDaysList.contains(item)).collect(Collectors.toList());
|
|
|
//差集拼接 开始 和 结束时间
|