Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r29440 -r29443 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 29440) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 29443) @@ -8065,6 +8065,10 @@ workLoadBean.setMaterialAmount(amount); workLoadBean.setColumnName(type); workLoadBean.setSequence(sequenceMap.get(type)); + if(disposableGoodsMap.containsKey(userName)){ + workLoadBean.setDisposableGoodAmount(disposableGoodsMap.get(userName)); + disposableGoodsMap.remove(userName); + } if (scoreConfigMap.size() > 0) { Integer scoreConfig = scoreConfigMap.get(type); if(scoreConfig != null && scoreConfig > 0){ @@ -8080,6 +8084,18 @@ DatabaseUtil.closeResultSetAndStatement(rs2); } } + if(MapUtils.isNotEmpty(disposableGoodsMap)){ + StatisticalWorkload workLoadBean = new StatisticalWorkload(); + for (String userName : disposableGoodsMap.keySet()) { + workLoadBean.setOperator(userName); + workLoadBean.setMaterialAmount(0); + workLoadBean.setDisposableGoodAmount(disposableGoodsMap.get(userName)); + workLoadBean.setColumnName("发货数量"); + workLoadBean.setSequence(sequenceMap.get("发货数量")); + disposableGoodsMap.remove(userName); + list.add(workLoadBean); + } + } } return list;