Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r13628 -r13666 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 13628) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 13666) @@ -72,6 +72,7 @@ import com.forgon.disinfectsystem.entity.foreigntousseapplication.ForeignTousseApplication; import com.forgon.disinfectsystem.entity.invoicemanager.DiposableGoodsItem; import com.forgon.disinfectsystem.entity.invoicemanager.Invoice; +import com.forgon.disinfectsystem.entity.invoicemanager.InvoiceItem; import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan; import com.forgon.disinfectsystem.entity.invoicemanager.MaterialItem; import com.forgon.disinfectsystem.entity.materialmanager.MaterialCheck; @@ -3728,8 +3729,8 @@ } String invoicePriceSql = "select '' as coding,min(i.settleAccountsDepart) " - + "as depart,sum(ii.settlementPrice) as price,ii.diposable from Invoice i," - + "InvoiceItem ii where i.id = ii.invoice_id and "+invoiceItemDisposableGoodsTypePredicate+" and i.orgUnitCoding = '" + handleDeptCode + "' and (i.status ='收货签收' or " + + "as depart,sum(ii.settlementPrice) as price,ii.diposable from " + Invoice.class.getSimpleName() + " i," + + InvoiceItem.class.getSimpleName() + " ii where i.id = ii.invoice_id and "+invoiceItemDisposableGoodsTypePredicate+" and i.orgUnitCoding = '" + handleDeptCode + "' and (i.status ='收货签收' or " + "i.status = '已发货') " + invoiceWheresql + tousseTypeInvoiceSql + " group by i.settleAccountsDepart,ii.diposable"; ResultSet rs = objectDao.executeSql(invoicePriceSql); try {