Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r32914 -r32922 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 32914) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 32922) @@ -23519,7 +23519,7 @@ if (StringUtils.isNotBlank(startDay)) { startDay += ":00"; } - String sql = "select tempt.supplierName,tempt.foreignTousseChargeModeName,tempt.specification,sum(tempt.price) price,sum(tempt.amount) amount,sum(tempt.totalPrice) totalPrice from (select cs.supplierName,csmi.foreignTousseChargeModeName,case when csmi.chargeMode='" + String sql = "select tempt.supplierName,tempt.foreignTousseChargeModeName,tempt.specification,tempt.price,sum(tempt.amount) amount,sum(tempt.totalPrice) totalPrice from (select cs.supplierName,csmi.foreignTousseChargeModeName,case when csmi.chargeMode='" + ForeignTousseChargeMode.MODE_RATE + "' then cssi.foreignTousseSpecName else null end specification,case when csmi.chargeMode='" + ForeignTousseChargeMode.MODE_RATE @@ -23554,7 +23554,7 @@ if(DatabaseUtil.isPoIdValid(specificationId)){ sql += " and cssi.foreignTousseSpecID ='" + specificationId + "' "; } - sql += " ) tempt left join "+ ForeignTousseSpecification.class.getSimpleName() +" fts on fts.name=tempt.specification where tempt.amount>0 group by tempt.supplierName,tempt.foreignTousseChargeModeName,tempt.specification,fts.id order by tempt.supplierName, tempt.foreignTousseChargeModeName,fts.id "; + sql += " ) tempt left join "+ ForeignTousseSpecification.class.getSimpleName() +" fts on fts.name=tempt.specification where tempt.amount>0 group by tempt.supplierName,tempt.foreignTousseChargeModeName,tempt.specification,fts.id,tempt.price order by tempt.supplierName, tempt.foreignTousseChargeModeName,fts.id,tempt.price "; return sql; } @Override