From a856ddec6776e6145d7893fe154db2fc5d3445c7 Mon Sep 17 00:00:00 2001 From: "anna.ho" Date: Wed, 1 Jun 2022 16:57:39 +0800 Subject: [PATCH] customer report --- .../reports/view/CustomerReportExcelView.java | 11 ++++++++--- .../reports/web/CustomerReportController.java | 2 +- src/main/webapp/WEB-INF/report/customer.xlsx | Bin 19154 -> 19192 bytes 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ffii/tbms/reports/view/CustomerReportExcelView.java b/src/main/java/com/ffii/tbms/reports/view/CustomerReportExcelView.java index f328c39..3b4ea24 100644 --- a/src/main/java/com/ffii/tbms/reports/view/CustomerReportExcelView.java +++ b/src/main/java/com/ffii/tbms/reports/view/CustomerReportExcelView.java @@ -54,9 +54,14 @@ public class CustomerReportExcelView extends AbstractExcelView { String reportHeader = (String)model.get("reportHeader"); Map map = (Map) model.get("map"); - sheet.getHeader().setCenter(HSSFHeader.font("Calibri", "bold")+(reportHeader==null?"":reportHeader)+"\n"+REPORT_NAME+" (" - +simpleDateFormat.format(map.get("dateFrom"))+" - " - +simpleDateFormat.format(map.get("dateTo"))+")"); + String searchArgsStr = "\n"; + if(map.containsKey("dateFrom")){ + searchArgsStr+="From: "+simpleDateFormat.format(map.get("dateFrom"))+" "; + } + if(map.containsKey("dateTo")){ + searchArgsStr+="To: "+simpleDateFormat.format(map.get("dateTo")); + } + sheet.getHeader().setCenter(HSSFHeader.font("Calibri", "bold")+(reportHeader==null?"":reportHeader)+"\n"+REPORT_NAME+searchArgsStr); int rowIndex = 1; for (int i = 0; i < records.size(); i++) { diff --git a/src/main/java/com/ffii/tbms/reports/web/CustomerReportController.java b/src/main/java/com/ffii/tbms/reports/web/CustomerReportController.java index b09ef45..5f49f1f 100644 --- a/src/main/java/com/ffii/tbms/reports/web/CustomerReportController.java +++ b/src/main/java/com/ffii/tbms/reports/web/CustomerReportController.java @@ -51,7 +51,7 @@ public class CustomerReportController extends AbstractController { Map args = new HashMap(); CriteriaUtils.addDate(request, args, "dateFrom"); CriteriaUtils.addDateTo(request, args, "dateTo"); - CriteriaUtils.addStringLike(request, args, "customerName"); + CriteriaUtils.addString(request, args, "customerName"); CriteriaUtils.addStringLike(request, args, "phone"); CriteriaUtils.addStringLike(request, args, "email"); CriteriaUtils.addStringLike(request, args, "address"); diff --git a/src/main/webapp/WEB-INF/report/customer.xlsx b/src/main/webapp/WEB-INF/report/customer.xlsx index 964914f2005906fb4157df72d7497e622cd830b6..43b7caf6c4b0b478bef430bee27cb79379da8803 100644 GIT binary patch delta 3688 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 WsRbSaeE--9pj}g(cuwV?lz#z_(aBu^