Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r27076 -r27133 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 27076) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 27133) @@ -6038,26 +6038,25 @@ */ private Map getDisinfectGoodsStatisticAmount(Set toussedefinitionIdSet) { Map tdIdAndAmountMap = new HashMap(); - if(toussedefinitionIdSet.size() == 0){ + if(CollectionUtils.isEmpty(toussedefinitionIdSet)){ return tdIdAndAmountMap; } - String sql = "select sum(i.count) count,t.id from Toussedefinition t,MaterialInstance i " - + "where t.id = i.tousse_id and " + SqlUtils.getNonStringFieldInLargeCollectionsPredicate("t.id", toussedefinitionIdSet) - + " and ((t.isApplyEntireTousse='" + Constants.STR_NO +"' and t.tousseType='" - + TousseDefinition.PACKAGE_TYPE_DISINFECTION+"') or t.tousseType='"+TousseDefinition.PACKAGE_TYPE_CUSTOM+"') group by t.id"; - ResultSet rs = objectDao.executeSql(sql); - if(rs != null){ - try { - if(rs.next()){ - Long id = rs.getLong("id"); - Integer count = rs.getInt("count"); - tdIdAndAmountMap.put(id, count); - } - } catch (SQLException e) { - e.printStackTrace(); - } finally { - DatabaseUtil.closeResultSetAndStatement(rs); + ResultSet rs = null; + try { + String sql = "select sum(i.count) count,t.id from Toussedefinition t,MaterialInstance i " + + "where t.id = i.tousse_id and " + SqlUtils.getNonStringFieldInLargeCollectionsPredicate("t.id", toussedefinitionIdSet) + + " and ((t.isApplyEntireTousse='" + Constants.STR_NO +"' and t.tousseType='" + + TousseDefinition.PACKAGE_TYPE_DISINFECTION+"') or t.tousseType='"+TousseDefinition.PACKAGE_TYPE_CUSTOM+"') group by t.id"; + rs = objectDao.executeSql(sql); + while(rs.next()){ + Long id = rs.getLong("id"); + Integer count = rs.getInt("count"); + tdIdAndAmountMap.put(id, count); } + } catch (SQLException e) { + e.printStackTrace(); + } finally { + DatabaseUtil.closeResultSetAndStatement(rs); } return tdIdAndAmountMap; }