Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r35903 -r35904
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 35903)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 35904)
@@ -1347,32 +1347,6 @@
return null;
}
}
-
- /**
- * 获取指定科室的 科室编码和科室名称的Map,前提此科室必须有登记过使用记录,
- * 如果某科室录入多条使用记录,则此科室在Map里面只存一条.
- * @param depart 指定的科室,如果不指定则默认为全部科室
- * @return
- */
- private Map getDepartFromUseRecord(String depart) {
- Map map = new HashMap();
- String sql = "select distinct depart,departcoding from userecord ";
- if (!depart.equals("")) {
- sql += "where depart='" + depart + "'";
- }
- ResultSet rs = objectDao.executeSql(sql);
- try {
- while (rs.next()) {
- map.put(rs.getString("departcoding"), rs.getString("depart"));
- }
- } catch (Exception e) {
- e.printStackTrace();
- }finally {
- DatabaseUtil.closeResultSetAndStatement(rs);
- }
- return map;
- }
-
@Override
public List getUseRecordDataSource2(String departmentName, String operator,
String startTime, String endTime){
@@ -2442,21 +2416,6 @@
}
}
- private double getTotalPrice(String sql){
- double totalPrice = 0.0;
- logger.debug("getTotalPrice sql=" + sql);
- ResultSet rs = objectDao.executeSql(sql);
- try {
- if(rs.next()){
- totalPrice = rs.getDouble("totalPrice");
- }
- } catch (SQLException e) {
- e.printStackTrace();
- }finally{
- DatabaseUtil.closeResultSetAndStatement(rs);
- }
- return totalPrice;
- }
public List createGoodsSummary(StockTakeRecord currentRecord,StockTakeRecord lastMonthRecord,String type, boolean manualInIncludeSyncIn){
List list = createGoodsDetail(currentRecord,lastMonthRecord,type, manualInIncludeSyncIn);
MonthGoodsDetailVo vo = new MonthGoodsDetailVo();