Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java =================================================================== diff -u -r28440 -r28913 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java (.../JasperReportManager.java) (revision 28440) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java (.../JasperReportManager.java) (revision 28913) @@ -184,9 +184,17 @@ public List getDeviceMaintenanceSource( String startDate, String endDate,String querySupplyRoom); - - public List getReturnGoodsSummarySource(String startDay,String endDay,String type,String department); /** + * + * @param startDay + * @param endDay + * @param type + * @param department + * @param goodsName 物品名称 + * @return + */ + public List getReturnGoodsSummarySource(String startDay,String endDay,String type,String department,String goodsName); + /** * 获取签收统计报表的数据源 * @param startDay 起始日期 * @param endDay 结束日期 Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r28877 -r28913 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 28877) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 28913) @@ -12256,7 +12256,7 @@ } @Override public List getReturnGoodsSummarySource(String startDay, String endDay,String type, - String department) { + String department, String goodsName) { List summarys = new ArrayList(); ReturnGoodsSummaryService summaryService = new ReturnGoodsSummaryService(); if(StringUtils.isNotBlank(startDay) && StringUtils.isNotBlank(endDay)){ @@ -12298,6 +12298,10 @@ String handleDeptCode = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig(); sql += " and m.handleDepartCode = '" + handleDeptCode + "'"; } + sql += SqlUtils.getWhereSqlByfilterFieldAndStringValue("m.name", goodsName);//精确查询 + /*if(StringUtils.isNotBlank(goodsName)){//模糊查询 + sql += " and m.name like '%" + goodsName + "%'"; + }*/ sql += " order by (case when t.sequence is null then 9999 else t.sequence end)"; //sql += "group by m.departCoding";