Index: ssts-web/src/main/webapp/jasperRtp/monthReportGroupByDisposableGoodsType.jrxml
===================================================================
diff -u -r30980 -r36554
--- ssts-web/src/main/webapp/jasperRtp/monthReportGroupByDisposableGoodsType.jrxml (.../monthReportGroupByDisposableGoodsType.jrxml) (revision 30980)
+++ ssts-web/src/main/webapp/jasperRtp/monthReportGroupByDisposableGoodsType.jrxml (.../monthReportGroupByDisposableGoodsType.jrxml) (revision 36554)
@@ -186,7 +186,7 @@
-
+
Index: ssts-web/src/main/webapp/jasperRtp/monthReportGroupByDisposableGoodsType.jasper
===================================================================
diff -u -r30980 -r36554
Binary files differ
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r36338 -r36554
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 36338)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 36554)
@@ -1025,7 +1025,7 @@
}else{
parametMap.put("amountFormat", moneyDigitCount == 2?"###0.00":"###0.0000");
}
- if("accountingMonthlyReportGroupByDisposableGoodsType".equals(patternOfReport)){
+ if("monthReportGroupByDisposableGoodsType.jasper".equals(jasperreportName)){
String endYear = endDate.substring(0, 4);
String endMonth = endDate.substring(5, 7);
String endDay = endDate.substring(8, 10);