diff --git a/business-service/src/main/java/com/ho/business/controller/EarningsCalculateController.java b/business-service/src/main/java/com/ho/business/controller/EarningsCalculateController.java index 0868fdd..65d1a5a 100644 --- a/business-service/src/main/java/com/ho/business/controller/EarningsCalculateController.java +++ b/business-service/src/main/java/com/ho/business/controller/EarningsCalculateController.java @@ -207,10 +207,6 @@ public class EarningsCalculateController { String lang = req.getHeader(CommonConstant.LANG); earningsCalculateReq.setLang(lang); EarningsCalculateResp total = earningsCalculateService.getTotal(earningsCalculateReq,PAGE_LIST_TYPE); - if(total.getCharge()==null){ - total.setCharge(new ArrayList<>()); - total.setDischarge(new ArrayList<>()); - } ServletOutputStream out = null; try { out = response.getOutputStream(); diff --git a/business-service/src/main/resources/template/RevenueOverview.xlsx b/business-service/src/main/resources/template/RevenueOverview.xlsx index add73a1..5d92c65 100644 Binary files a/business-service/src/main/resources/template/RevenueOverview.xlsx and b/business-service/src/main/resources/template/RevenueOverview.xlsx differ diff --git a/business-service/src/main/resources/template/RevenueOverviewen_US.xlsx b/business-service/src/main/resources/template/RevenueOverviewen_US.xlsx index cd5b7ba..2c73cda 100644 Binary files a/business-service/src/main/resources/template/RevenueOverviewen_US.xlsx and b/business-service/src/main/resources/template/RevenueOverviewen_US.xlsx differ diff --git a/business-service/src/main/resources/template/earningsTemplate.xlsx b/business-service/src/main/resources/template/earningsTemplate.xlsx index d3e99aa..852d0d7 100644 Binary files a/business-service/src/main/resources/template/earningsTemplate.xlsx and b/business-service/src/main/resources/template/earningsTemplate.xlsx differ diff --git a/business-service/src/main/resources/template/earningsTemplateen_US.xlsx b/business-service/src/main/resources/template/earningsTemplateen_US.xlsx index 287f419..0f4aad4 100644 Binary files a/business-service/src/main/resources/template/earningsTemplateen_US.xlsx and b/business-service/src/main/resources/template/earningsTemplateen_US.xlsx differ diff --git a/business-service/src/main/resources/template/earningsUserTemplate.xlsx b/business-service/src/main/resources/template/earningsUserTemplate.xlsx index d774cf5..5e6d4d6 100644 Binary files a/business-service/src/main/resources/template/earningsUserTemplate.xlsx and b/business-service/src/main/resources/template/earningsUserTemplate.xlsx differ diff --git a/business-service/src/main/resources/template/earningsUserTemplateen_US.xlsx b/business-service/src/main/resources/template/earningsUserTemplateen_US.xlsx index dab59bc..73f79fc 100644 Binary files a/business-service/src/main/resources/template/earningsUserTemplateen_US.xlsx and b/business-service/src/main/resources/template/earningsUserTemplateen_US.xlsx differ