customer report

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<String, Object> map = (Map<String,Object>) 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++) {

src/main/java/com/ffii/tbms/reports/web/CustomerReportController.java

@@ -51,7 +51,7 @@ public class CustomerReportController extends AbstractController {
 			Map<String, Object> args = new HashMap<String, Object>();
 			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");