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 964914f..43b7caf 100644 Binary files a/src/main/webapp/WEB-INF/report/customer.xlsx and b/src/main/webapp/WEB-INF/report/customer.xlsx differ