|
@@ -114,6 +114,11 @@ public class CreateSheetServiceImpl implements ICreateSheetService {
|
|
cell = row.createCell(15);
|
|
cell = row.createCell(15);
|
|
cell.setCellValue("政策时间");
|
|
cell.setCellValue("政策时间");
|
|
cell.setCellStyle(style);
|
|
cell.setCellStyle(style);
|
|
|
|
+
|
|
|
|
+ cell = row.createCell(16);
|
|
|
|
+ cell.setCellValue("激活");
|
|
|
|
+ cell.setCellStyle(style);
|
|
|
|
+
|
|
sheet.autoSizeColumn(0, true);
|
|
sheet.autoSizeColumn(0, true);
|
|
List<SheetBytedanceVo> resultList = new ArrayList<>(accountIdList.size());
|
|
List<SheetBytedanceVo> resultList = new ArrayList<>(accountIdList.size());
|
|
//获取当前年月的 第一天 和 最后一天
|
|
//获取当前年月的 第一天 和 最后一天
|
|
@@ -180,6 +185,9 @@ public class CreateSheetServiceImpl implements ICreateSheetService {
|
|
vo.setTransferOut(Check.isNull(listAccount) ? "0" : listAccount.get(0).getOrDefault("transferOut", "") + "");//总转出
|
|
vo.setTransferOut(Check.isNull(listAccount) ? "0" : listAccount.get(0).getOrDefault("transferOut", "") + "");//总转出
|
|
BeanUtils.copyProperties(voSource, vo, SettlementUtil.getNullPropertyNames(voSource));
|
|
BeanUtils.copyProperties(voSource, vo, SettlementUtil.getNullPropertyNames(voSource));
|
|
vo.setTime(stringMap.get("startDate") + "----" + stringMap.get("endDate"));
|
|
vo.setTime(stringMap.get("startDate") + "----" + stringMap.get("endDate"));
|
|
|
|
+
|
|
|
|
+ String active = reportSettlementMapper.getBytedanceActive(map.get("accountId") + "", stringMap.get("startDate"), stringMap.get("endDate"));
|
|
|
|
+ vo.setActive(active);
|
|
resultList.add(vo);
|
|
resultList.add(vo);
|
|
policyDaysList.addAll(SettlementUtil.getAllDatesOfTwoTimes(stringMap.get("startDate"), stringMap.get("endDate")));
|
|
policyDaysList.addAll(SettlementUtil.getAllDatesOfTwoTimes(stringMap.get("startDate"), stringMap.get("endDate")));
|
|
}
|
|
}
|
|
@@ -213,6 +221,8 @@ public class CreateSheetServiceImpl implements ICreateSheetService {
|
|
vo.setTransferOut(Check.isNull(listAccount) ? "0" : listAccount.get(0).getOrDefault("transferOut", "") + "");//总转出
|
|
vo.setTransferOut(Check.isNull(listAccount) ? "0" : listAccount.get(0).getOrDefault("transferOut", "") + "");//总转出
|
|
BeanUtils.copyProperties(voSource, vo, SettlementUtil.getNullPropertyNames(voSource));
|
|
BeanUtils.copyProperties(voSource, vo, SettlementUtil.getNullPropertyNames(voSource));
|
|
vo.setTime((!Check.isNull(vo.getRebateType()) ? stringMap.get("startDate") + "----" + stringMap.get("endDate") : ""));
|
|
vo.setTime((!Check.isNull(vo.getRebateType()) ? stringMap.get("startDate") + "----" + stringMap.get("endDate") : ""));
|
|
|
|
+ String active = reportSettlementMapper.getBytedanceActive(map.get("accountId") + "", stringMap.get("startDate"), stringMap.get("endDate"));
|
|
|
|
+ vo.setActive(active);
|
|
resultList.add(vo);
|
|
resultList.add(vo);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -240,6 +250,7 @@ public class CreateSheetServiceImpl implements ICreateSheetService {
|
|
row.createCell(13).setCellValue(vo.getRebateType());
|
|
row.createCell(13).setCellValue(vo.getRebateType());
|
|
row.createCell(14).setCellValue(vo.getRebateRate());
|
|
row.createCell(14).setCellValue(vo.getRebateRate());
|
|
row.createCell(15).setCellValue(vo.getTime());
|
|
row.createCell(15).setCellValue(vo.getTime());
|
|
|
|
+ row.createCell(16).setCellValue(vo.getActive());
|
|
// row.setRowStyle(style);
|
|
// row.setRowStyle(style);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -334,6 +345,10 @@ public class CreateSheetServiceImpl implements ICreateSheetService {
|
|
cell.setCellValue("政策时间");
|
|
cell.setCellValue("政策时间");
|
|
cell.setCellStyle(style);
|
|
cell.setCellStyle(style);
|
|
|
|
|
|
|
|
+ cell = row.createCell(18);
|
|
|
|
+ cell.setCellValue("激活");
|
|
|
|
+ cell.setCellStyle(style);
|
|
|
|
+
|
|
sheet.autoSizeColumn(0, true);
|
|
sheet.autoSizeColumn(0, true);
|
|
|
|
|
|
List<SheetKuaiShouVo> resultList = new ArrayList<>(accountIdList.size());
|
|
List<SheetKuaiShouVo> resultList = new ArrayList<>(accountIdList.size());
|
|
@@ -409,6 +424,8 @@ public class CreateSheetServiceImpl implements ICreateSheetService {
|
|
vo.setDirectRebateRealRecharged(listInfo.stream().filter(v -> !Check.isNull(v.getDirectRebateRealRecharged())).map(SheetKuaiShouVo::getDirectRebateRealRecharged).reduce(BigDecimal.ZERO, BigDecimal::add));
|
|
vo.setDirectRebateRealRecharged(listInfo.stream().filter(v -> !Check.isNull(v.getDirectRebateRealRecharged())).map(SheetKuaiShouVo::getDirectRebateRealRecharged).reduce(BigDecimal.ZERO, BigDecimal::add));
|
|
BeanUtils.copyProperties(voSource, vo, SettlementUtil.getNullPropertyNames(voSource));
|
|
BeanUtils.copyProperties(voSource, vo, SettlementUtil.getNullPropertyNames(voSource));
|
|
vo.setTime(stringMap.get("startDate") + "----" + stringMap.get("endDate"));
|
|
vo.setTime(stringMap.get("startDate") + "----" + stringMap.get("endDate"));
|
|
|
|
+ String activation = reportSettlementMapper.getKuaiShouActivation(map.get("accountId") + "", stringMap.get("startDate"), stringMap.get("endDate"));
|
|
|
|
+ vo.setActivation(activation);
|
|
resultList.add(vo);
|
|
resultList.add(vo);
|
|
policyDaysList.addAll(SettlementUtil.getAllDatesOfTwoTimes(stringMap.get("startDate"), stringMap.get("endDate")));
|
|
policyDaysList.addAll(SettlementUtil.getAllDatesOfTwoTimes(stringMap.get("startDate"), stringMap.get("endDate")));
|
|
}
|
|
}
|
|
@@ -444,6 +461,8 @@ public class CreateSheetServiceImpl implements ICreateSheetService {
|
|
vo.setDirectRebateRealRecharged(listInfo.stream().filter(v -> !Check.isNull(v.getDirectRebateRealRecharged())).map(SheetKuaiShouVo::getDirectRebateRealRecharged).reduce(BigDecimal.ZERO, BigDecimal::add));
|
|
vo.setDirectRebateRealRecharged(listInfo.stream().filter(v -> !Check.isNull(v.getDirectRebateRealRecharged())).map(SheetKuaiShouVo::getDirectRebateRealRecharged).reduce(BigDecimal.ZERO, BigDecimal::add));
|
|
BeanUtils.copyProperties(voSource, vo, SettlementUtil.getNullPropertyNames(voSource));
|
|
BeanUtils.copyProperties(voSource, vo, SettlementUtil.getNullPropertyNames(voSource));
|
|
vo.setTime(!Check.isNull(vo.getRebateType()) ? stringMap.get("startDate") + "----" + stringMap.get("endDate") : "");
|
|
vo.setTime(!Check.isNull(vo.getRebateType()) ? stringMap.get("startDate") + "----" + stringMap.get("endDate") : "");
|
|
|
|
+ String activation = reportSettlementMapper.getKuaiShouActivation(map.get("accountId") + "", stringMap.get("startDate"), stringMap.get("endDate"));
|
|
|
|
+ vo.setActivation(activation);
|
|
resultList.add(vo);
|
|
resultList.add(vo);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -473,6 +492,7 @@ public class CreateSheetServiceImpl implements ICreateSheetService {
|
|
row.createCell(15).setCellValue(vo.getRebateType());
|
|
row.createCell(15).setCellValue(vo.getRebateType());
|
|
row.createCell(16).setCellValue(vo.getRebateRate());
|
|
row.createCell(16).setCellValue(vo.getRebateRate());
|
|
row.createCell(17).setCellValue(vo.getTime());
|
|
row.createCell(17).setCellValue(vo.getTime());
|
|
|
|
+ row.createCell(18).setCellValue(vo.getActivation());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|