Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java =================================================================== diff -u -r29064 -r29261 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java (.../WorkQualityCollectionDataIndex.java) (revision 29064) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java (.../WorkQualityCollectionDataIndex.java) (revision 29261) @@ -685,6 +685,8 @@ Integer amount = 0; Integer thisYearAmount = 0; try { + //防止月份相同,数据被覆盖 + Map monthAmountMap = new HashMap(); while (result.next()) { key = result.getString(1); // 月份以0开头的,去掉0 @@ -694,6 +696,10 @@ amount = result.getInt(2); if(amount != null & amount >0){ thisYearAmount += amount; + if(monthAmountMap.containsKey(key)){ + amount += monthAmountMap.get(key); + } + monthAmountMap.put(key, amount); } dataIndex.setWorkQualityBeanAmount(bean, key, amount); }