Index: forgon-core/src/main/java/com/forgon/directory/action/UserAction.java =================================================================== diff -u -r19224 -r19227 --- forgon-core/src/main/java/com/forgon/directory/action/UserAction.java (.../UserAction.java) (revision 19224) +++ forgon-core/src/main/java/com/forgon/directory/action/UserAction.java (.../UserAction.java) (revision 19227) @@ -318,7 +318,7 @@ likeSql += " or u.wbCode like '%"+spell.toUpperCase() +"%')"; } - //需不需要一个“全部”的标识 + //需不需要一个“全部人员”的标识 String needAll = StrutsParamUtils.getPraramValue("needAll", ""); String departmentCode = StrutsParamUtils.getPraramValue("departmentCode", ""); String departmentCodeSql = ""; @@ -349,7 +349,7 @@ if ("yes".equals(needAll) && CollectionUtils.isNotEmpty(list)) { Map map = new HashMap(); map.put("id", -1); - map.put("name", "全部"); + map.put("name", "全部人员"); list.add(0, map); } PageEntity pe= PageUtil.getPagePara(); Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r19224 -r19227 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 19224) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 19227) @@ -1438,7 +1438,9 @@ }else if (reportName.equals("tousseWorkLoad")){ String startDay = StrutsParamUtils.getPraramValue("startDay", ""); String endDay = StrutsParamUtils.getPraramValue("endDay", ""); + String operator = StrutsParamUtils.getPraramValue("operator", ""); map.put("title", "器械包工作量统计报表("+startDay+" ~ "+endDay+")"); + map.put("remark", "操作员:" + (StringTools.isBlank(operator) ? "全部人员" : operator)); }else if("tousseOperate".equals(reportName)){ getTousseOperateParam(map); }else if("apparatusInfusionisType".equals(reportName)){ Index: ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad.jrxml =================================================================== diff -u -r19224 -r19227 --- ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad.jrxml (.../tousseWorkLoad.jrxml) (revision 19224) +++ ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad.jrxml (.../tousseWorkLoad.jrxml) (revision 19227) @@ -15,6 +15,9 @@ + + + @@ -62,6 +65,13 @@ + + + + + + + @@ -205,7 +215,7 @@ - + Index: ssts-web/src/main/webapp/jasperRtp/tousseWorkLoad.jasper =================================================================== diff -u -r19224 -r19227 Binary files differ Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r19224 -r19227 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 19224) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 19227) @@ -10796,7 +10796,7 @@ String andSql = ""; if (StringTools.isNotBlank(field) && StringTools.isNotBlank(value) - && !"全部".equals(value)) { + && !"全部人员".equals(value)) { andSql = String.format("and %s='%s'", field, value); } return andSql;