Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java =================================================================== diff -u -r35879 -r35917 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java (.../JasperReportManager.java) (revision 35879) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java (.../JasperReportManager.java) (revision 35917) @@ -232,9 +232,6 @@ public List getWashFractionDefectiveChart( String queryYear,String querySupplyRoom); - public List getGoodsDistributeReportChart(String startDate, - String endDate, String goodsName,String supplyRoomName,boolean disinfection); - public List getAmountContrastBeanList( String startMonth, String endMonth, String departCoding, String goodsName); Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/InvoiceReportManagerImpl.java =================================================================== diff -u --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/InvoiceReportManagerImpl.java (revision 0) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/InvoiceReportManagerImpl.java (revision 35917) @@ -0,0 +1,69 @@ +package com.forgon.disinfectsystem.jasperreports.service; + +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; + +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import com.forgon.databaseadapter.service.DateQueryAdapter; +import com.forgon.disinfectsystem.jasperreports.javabeansource.BaseBean; +import com.forgon.tools.db.DatabaseUtil; +import com.forgon.tools.hibernate.ObjectDao; +import com.forgon.tools.util.SqlUtils; +/** + * 发货相关的一些报表 + * + */ +@Component("invoiceReportManager") +public class InvoiceReportManagerImpl implements InvoiceReportManager{ + @Autowired + private ObjectDao objectDao; + @Autowired + private DateQueryAdapter dateQueryAdapter; + @Override + public List getGoodsDistributeReportChart(String startDate, + String endDate, String goodsName,String querySupplyRoom,boolean disinfection) { + List beans = new ArrayList(); + if (StringUtils.isNotBlank(startDate) + && StringUtils.isNotBlank(endDate) + && StringUtils.isNotBlank(goodsName)) { + String serchName = ""; + if(disinfection){ + serchName = " and pi.tousseName like '%"+ goodsName+ "%'"; + }else{ + serchName = " and pi.tousseName = '"+ goodsName+ "'"; + } + startDate += " 00:00:00"; + endDate += " 23:59:59"; + String sql = " select po.settleAccountsDepart,sum(pi.amount) from invoice po,InvoiceItem pi where po.id = pi.invoice_id and po.sendTime between " + + dateQueryAdapter.dateAdapter(startDate) + + " and " + + dateQueryAdapter.dateAdapter(endDate) + + serchName + + " and (po.status = '已发货' or po.status = '收货签收') "; + sql += SqlUtils.get_InSql_Extra("po.orgUnitCoding", querySupplyRoom); + sql += " group by po.settleAccountsDepart"; + ResultSet rs = objectDao.executeSql(sql); + try { + while (rs.next()) { + String depart = rs.getString(1); + Integer amount = rs.getInt(2); + BaseBean bean = new BaseBean(); + bean.setKey1(depart); + bean.setValue1(amount); + beans.add(bean); + } + } catch (SQLException e) { + e.printStackTrace(); + }finally { + DatabaseUtil.closeResultSetAndStatement(rs); + } + + } + return beans; + } +} Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r35911 -r35917 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 35911) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 35917) @@ -797,50 +797,7 @@ String year,String querySupplyRoom) { return materialWashUnqualifiedReportHelper.getWashFractionDefectiveChart(year, querySupplyRoom); } - @Override - public List getGoodsDistributeReportChart(String startDate, - String endDate, String goodsName,String querySupplyRoom,boolean disinfection) { - List beans = new ArrayList(); - if (StringUtils.isNotBlank(startDate) - && StringUtils.isNotBlank(endDate) - && StringUtils.isNotBlank(goodsName)) { - String serchName = ""; - if(disinfection){ - serchName = " and pi.tousseName like '%"+ goodsName+ "%'"; - }else{ - serchName = " and pi.tousseName = '"+ goodsName+ "'"; - } - startDate += " 00:00:00"; - endDate += " 23:59:59"; - String sql = " select po.settleAccountsDepart,sum(pi.amount) from invoice po,InvoiceItem pi where po.id = pi.invoice_id and po.sendTime between " - + dateQueryAdapter.dateAdapter(startDate) - + " and " - + dateQueryAdapter.dateAdapter(endDate) - + serchName - + " and (po.status = '已发货' or po.status = '收货签收') "; - sql += SqlUtils.get_InSql_Extra("po.orgUnitCoding", querySupplyRoom); - sql += " group by po.settleAccountsDepart"; - ResultSet rs = objectDao.executeSql(sql); - try { - while (rs.next()) { - String depart = rs.getString(1); - Integer amount = rs.getInt(2); - BaseBean bean = new BaseBean(); - bean.setKey1(depart); - bean.setValue1(amount); - beans.add(bean); - } - } catch (SQLException e) { - e.printStackTrace(); - }finally { - DatabaseUtil.closeResultSetAndStatement(rs); - } - - } - return beans; - } - @Override public List getAmountContrastBeanList( String startMonth, String endMonth, String departCoding, String goodsName) { return amountContrastReportHelper.getAmountContrastBeanList(startMonth, endMonth, departCoding, goodsName); Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r35879 -r35917 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 35879) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 35917) @@ -104,6 +104,7 @@ import com.forgon.disinfectsystem.jasperreports.service.CustomReportsOfDgsfy; import com.forgon.disinfectsystem.jasperreports.service.CustomReportsOfXjjqzyy; import com.forgon.disinfectsystem.jasperreports.service.CustomReportsOfZsyy; +import com.forgon.disinfectsystem.jasperreports.service.InvoiceReportManager; import com.forgon.disinfectsystem.jasperreports.service.JasperReportManager; import com.forgon.disinfectsystem.jasperreports.service.WorkQualityCollectionReport; import com.forgon.disinfectsystem.recyclingrecord.service.RecyclingItemManager; @@ -159,6 +160,11 @@ private BrancheOfHospitalManager brancheOfHospitalManager; private OnlineUserManager onlineUserManager; + private InvoiceReportManager invoiceReportManager; + public void setInvoiceReportManager( + InvoiceReportManager invoiceReportManager) { + this.invoiceReportManager = invoiceReportManager; + } public void setOnlineUserManager(OnlineUserManager onlineUserManager) { this.onlineUserManager = onlineUserManager; } @@ -898,7 +904,7 @@ } } if (StringUtils.isNotBlank(goodsName)) { - return jasperReportManager.getGoodsDistributeReportChart( + return invoiceReportManager.getGoodsDistributeReportChart( startDate, endDate, goodsName,querySupplyRoom,disinfection); } } else if (reportName.equals("amountContrast")) {// 一次性物品发货数量对比报表 Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/InvoiceReportManager.java =================================================================== diff -u --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/InvoiceReportManager.java (revision 0) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/InvoiceReportManager.java (revision 35917) @@ -0,0 +1,18 @@ +package com.forgon.disinfectsystem.jasperreports.service; + +import java.util.List; +import com.forgon.disinfectsystem.jasperreports.javabeansource.BaseBean; + +public interface InvoiceReportManager { + /** + * 物品发放分布饼图 + * @param startDate + * @param endDate + * @param goodsName + * @param supplyRoomName + * @param disinfection + * @return + */ + public List getGoodsDistributeReportChart(String startDate, + String endDate, String goodsName,String supplyRoomName,boolean disinfection); +}