Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java =================================================================== diff -u -r35958 -r35959 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java (.../JasperReportManager.java) (revision 35958) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java (.../JasperReportManager.java) (revision 35959) @@ -374,14 +374,6 @@ public List getUseRecordItemDataSource(Map requestParameters, Map parametMap) throws ParseException; /** - * @param sql - * @return - * 2014-9-3 - * @throws SQLException - */ - public List getUseRecordOperatorTotalViewData( - String sql) throws SQLException; - /** * 灭菌记录使用次数统计报表 * @param startTime 开始时间 * @param endTime 结束时间 Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r35958 -r35959 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 35958) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 35959) @@ -632,67 +632,6 @@ @Override public List getUseRecordItemDataSource(Map requestParameters, Map parametMap) throws ParseException { return useRecordEnterReportHelper.getUseRecordItemDataSource(requestParameters, parametMap); - } - @Override - public List getUseRecordOperatorTotalViewData( - String sql) throws SQLException { - List resultList = new ArrayList(); - Map>> map = new HashMap>>(); - ResultSet rs = objectDao.executeSql(sql); - try { - while (rs.next()) { - String depart = rs.getString("depart"); - String operator = rs.getString("operator"); - String tousseName = rs.getString("tousseName"); - int amount = rs.getInt("amount"); - if (map.containsKey(depart)) { - Map> mp = map - .get(depart); - if (mp.containsKey(operator)) { - List list = mp.get(operator); - UseRecordTousseItemBean b = new UseRecordTousseItemBean(); - b.setAmount(amount); - b.setTousseName(tousseName); - list.add(b); - } else { - List list = new ArrayList(); - UseRecordTousseItemBean b = new UseRecordTousseItemBean(); - b.setAmount(amount); - b.setTousseName(tousseName); - list.add(b); - mp.put(operator, list); - } - } else { - Map> mp = new HashMap>(); - List bb = new ArrayList(); - UseRecordTousseItemBean b = new UseRecordTousseItemBean(); - b.setAmount(amount); - b.setTousseName(tousseName); - bb.add(b); - mp.put(operator, bb); - map.put(depart, mp); - } - } - } catch (Exception e) { - e.printStackTrace(); - }finally { - DatabaseUtil.closeResultSetAndStatement(rs); - } - for(Entry>> entry: map.entrySet()){ - UseRecordOperatorBean bean = new UseRecordOperatorBean(); - bean.setDepart(entry.getKey()); - Map> mp = entry.getValue(); - List beans = new ArrayList(); - for(Entry> m :mp.entrySet()){ - UseRecordOperatorItemBean itemBean = new UseRecordOperatorItemBean(); - itemBean.setOperator(m.getKey()); - itemBean.setTousseItems(m.getValue()); - beans.add(itemBean); - } - bean.setOperatorBeans(beans); - resultList.add(bean); - } - return resultList; } @Override public List getSterilizingStoveUseCountData(String startTime,String endTime,String depart,