Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r35563 -r35574 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 35563) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 35574) @@ -2380,12 +2380,23 @@ parametMap.put("title", "器械维修记录报表" + startTime + "至" + endTime); startTime += ":00"; endTime += ":59"; - return jasperReportManager.getInstrumentRepairReportData(startTime, endTime, repairStatus, registrantName, materialName, tousseName); + List list = jasperReportManager.getInstrumentRepairReportData(startTime, endTime, repairStatus, registrantName, materialName, tousseName); + setNoDataReport(list, requestParameters); + return list; } } return null; } - + /** + * 报表无数据时 显示默认的没数据模板 + * @param list 报表数据 + * @param parametMap 报表参数 + */ + private void setNoDataReport(List list , Map requestParameters){ + if(CollectionUtils.isEmpty(list)){ + requestParameters.put("jasperreportName","noDataReport.jasper"); + } + } private List getMaterialDamageTotalViewDataSource() { List damageBeans = new ArrayList(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r35562 -r35574 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 35562) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 35574) @@ -31194,7 +31194,9 @@ + TousseDefinition.class.getSimpleName() +" td on td.id=g.toussedefinitionId left join " + MaterialDefinition.class.getSimpleName() - +" md on md.id=g.materialDefinitionID where registerDateTime " + +" md on md.id=g.materialDefinitionID where i.reviewStatus='" + + InstrumentRepair.REVIEW_STATUS_REVIEWED + +"' and registerDateTime " + String.format(" between %s and %s ", dateQueryAdapter.dateAdapter(startTime),dateQueryAdapter.dateAdapter(endTime)) + SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("i.repairStatus", repairStatus, ",") + SqlUtils.getWhereSqlByfilterFieldAndStringValue("i.registrantName", registrantName)