Index: ssts-web/src/main/webapp/jasperRtp/noDataReport.jasper
===================================================================
diff -u -r31721 -r33332
Binary files differ
Index: ssts-web/src/main/webapp/jasperRtp/noDataReport.jrxml
===================================================================
diff -u -r31721 -r33332
--- ssts-web/src/main/webapp/jasperRtp/noDataReport.jrxml (.../noDataReport.jrxml) (revision 31721)
+++ ssts-web/src/main/webapp/jasperRtp/noDataReport.jrxml (.../noDataReport.jrxml) (revision 33332)
@@ -27,6 +27,17 @@
+
+
+
+
+
+
+
+
+
+
+
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r33273 -r33332
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 33273)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 33332)
@@ -566,11 +566,17 @@
}
parametMap.put("title", title);
String inspectDetail = StrutsParamUtils.getPraramValue("inspectDetail", "");
+ List list = null;
if(StringUtils.isNotBlank(queryYear) && StringUtils.isNotBlank(queryMonth) ){
- return jasperReportManager.getQualityMonitoringInspectDayOfMonthParamet(queryYear,querySupplyRoom,queryMonth,monitoringType,inspectItem,inspectDetail,type,responsibilityType);
+ list = jasperReportManager.getQualityMonitoringInspectDayOfMonthParamet(queryYear,querySupplyRoom,queryMonth,monitoringType,inspectItem,inspectDetail,type,responsibilityType);
}else if(StringUtils.isNotBlank(queryYear) ){
- return jasperReportManager.getQualityMonitoringInspectMonthParamet(queryYear,querySupplyRoom,monitoringType,inspectItem,inspectDetail,type,responsibilityType);
+ list = jasperReportManager.getQualityMonitoringInspectMonthParamet(queryYear,querySupplyRoom,monitoringType,inspectItem,inspectDetail,type,responsibilityType);
}
+ if(CollectionUtils.isEmpty(list)){
+ requestParameters.put("jasperreportName",
+ "noDataReport.jasper");
+ }
+ return list;
}else if(reportName.equals("formInstanceReport")){
String startDate = StrutsParamUtils.getPraramValue("startDate", "");
String endDate = StrutsParamUtils.getPraramValue("endDate", "");