Index: ssts-web/src/main/webapp/jasperRtp/godownEntryStatistic_main.jasper =================================================================== diff -u -r13216 -r13221 Binary files differ Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r13220 -r13221 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 13220) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 13221) @@ -1165,8 +1165,9 @@ map.put("title", "入库物品统计报表("+startDay+"~"+endDay+")"); String suplierName = StrutsParamUtils.getPraramValue("suplierName", ""); if(StringUtils.isNotBlank(suplierName)){ - map.put("suplierName", "供应商:" + suplierName); + suplierName = "供应商:" + suplierName; } + map.put("suplier", suplierName); }else if ("godownEntryDetailStatistic".equals(reportName)) { String startDay = StrutsParamUtils.getPraramValue("timeStart", ""); String endDay = StrutsParamUtils.getPraramValue("timeEnd", ""); Index: ssts-web/src/main/webapp/jasperRtp/godownEntryStatistic_main.jrxml =================================================================== diff -u -r13216 -r13221 --- ssts-web/src/main/webapp/jasperRtp/godownEntryStatistic_main.jrxml (.../godownEntryStatistic_main.jrxml) (revision 13216) +++ ssts-web/src/main/webapp/jasperRtp/godownEntryStatistic_main.jrxml (.../godownEntryStatistic_main.jrxml) (revision 13221) @@ -44,6 +44,7 @@ + @@ -99,7 +100,7 @@ - + @@ -121,11 +122,18 @@ - + + + + + + + +