Index: ssts-web/src/main/webapp/jasperRtp/useRecordItemView.jrxml =================================================================== diff -u -r17425 -r17547 --- ssts-web/src/main/webapp/jasperRtp/useRecordItemView.jrxml (.../useRecordItemView.jrxml) (revision 17425) +++ ssts-web/src/main/webapp/jasperRtp/useRecordItemView.jrxml (.../useRecordItemView.jrxml) (revision 17547) @@ -1,5 +1,5 @@ - + @@ -55,9 +55,9 @@ - <band height="45" splitType="Stretch"> + <band height="38" splitType="Stretch"> <textField pattern="" isBlankWhenNull="true"> - <reportElement uuid="9b0cffa2-8d1f-48b0-9dd6-55c296bd9cb7" mode="Transparent" x="0" y="0" width="1226" height="45" forecolor="#000000" backcolor="#FFFFFF"/> + <reportElement uuid="9b0cffa2-8d1f-48b0-9dd6-55c296bd9cb7" mode="Transparent" x="0" y="0" width="1226" height="38" forecolor="#000000" backcolor="#FFFFFF"/> <textElement textAlignment="Center" verticalAlignment="Middle" rotation="None" markup="none"> <font fontName="SansSerif" size="16" isBold="true" isItalic="false" isUnderline="false" isStrikeThrough="false" pdfEncoding="Cp1252" isPdfEmbedded="false"/> <paragraph lineSpacing="Single"/> @@ -67,9 +67,9 @@ </band> - + - + @@ -83,7 +83,7 @@ - + @@ -97,7 +97,7 @@ - + @@ -111,7 +111,7 @@ - + @@ -125,7 +125,7 @@ - + @@ -139,7 +139,7 @@ - + @@ -153,7 +153,7 @@ - + @@ -167,7 +167,7 @@ - + @@ -181,7 +181,7 @@ - + @@ -195,7 +195,7 @@ - + @@ -209,7 +209,7 @@ - + @@ -225,119 +225,117 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: ssts-web/src/main/webapp/jasperRtp/useRecordItemViewSub.jrxml =================================================================== diff -u -r17425 -r17547 --- ssts-web/src/main/webapp/jasperRtp/useRecordItemViewSub.jrxml (.../useRecordItemViewSub.jrxml) (revision 17425) +++ ssts-web/src/main/webapp/jasperRtp/useRecordItemViewSub.jrxml (.../useRecordItemViewSub.jrxml) (revision 17547) @@ -1,9 +1,9 @@ - - + + - + @@ -20,9 +20,9 @@ - + - + @@ -37,7 +37,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -67,7 +67,7 @@ - + Index: ssts-web/src/main/webapp/jasperRtp/jasperreportsView.jsp =================================================================== diff -u -r15210 -r17547 --- ssts-web/src/main/webapp/jasperRtp/jasperreportsView.jsp (.../jasperreportsView.jsp) (revision 15210) +++ ssts-web/src/main/webapp/jasperRtp/jasperreportsView.jsp (.../jasperreportsView.jsp) (revision 17547) @@ -45,8 +45,7 @@ } - + @@ -114,9 +113,9 @@ timeStamp = ""; } JasperPrint jasperPrint = (JasperPrint)session.getAttribute("JasperPrint"+timeStamp); - reportName = jasperPrint.getName(); if(jasperPrint != null){ + reportName = jasperPrint.getName(); session.setAttribute(ImageServlet.DEFAULT_JASPER_PRINT_SESSION_ATTRIBUTE,jasperPrint); String currentTime = new Date().toString(); request.setAttribute("currentTime",currentTime); @@ -148,7 +147,7 @@ exporter.setParameter(JRExporterParameter.OUTPUT_STRING_BUFFER, sbuffer); //加time参数解决 IFrame中的图片存在缓存机制 exporter.setParameter(JRHtmlExporterParameter.IMAGES_URI, request.getContextPath()+"../../servlets/image?time="+currentTime+"&image="); - exporter.setParameter(JRExporterParameter.PAGE_INDEX, new Integer(pageIndex)); + exporter.setParameter(JRExporterParameter.PAGE_INDEX, new Integer(pageIndex)); //输出第几页 //exporter.setParameter(JRHtmlExporterParameter.HTML_HEADER, ""); exporter.setParameter(JRHtmlExporterParameter.BETWEEN_PAGES_HTML, ""); //exporter.setParameter(JRHtmlExporterParameter.HTML_FOOTER, ""); Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.jsp =================================================================== diff -u -r17187 -r17547 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.jsp (.../useRecordItemView.jsp) (revision 17187) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/useRecordItemView.jsp (.../useRecordItemView.jsp) (revision 17547) @@ -1,8 +1,7 @@ -<%@page import="org.apache.commons.lang.StringUtils"%> <%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%> -<%@page import="com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods,com.forgon.Constants"%> -<%@ page contentType="text/html; charset=UTF-8"%> -<%@ include file="/common/taglibs.jsp"%> +<%@page import="com.forgon.Constants"%> +<%@page contentType="text/html; charset=UTF-8"%> +<%@include file="/common/taglibs.jsp"%> <% @@ -18,41 +17,20 @@ %> <%@ include file="/common/includeExtJsAndCss.jsp"%> - - - - - - - - - + 使用记录录入明细报表 Index: ssts-web/src/main/webapp/jasperRtp/useRecordItemViewSub.jasper =================================================================== diff -u -r17425 -r17547 Binary files differ Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r17527 -r17547 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 17527) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 17547) @@ -182,12 +182,10 @@ } /** - * 报表中心，sql做数据源 - * + * sql语句做数据源，创建报表 * @return */ public String createJasperPrint() { - String jasperreportName = StrutsParamUtils.getPraramValue("jasperreportName", ""); //报表的jasper文件名称，如workload.jasper String reportName = StrutsParamUtils.getPraramValue("reportName", ""); //报表模块名称，根据不同的报表配置不同的参数 if (StringUtils.isNotBlank(jasperreportName)) { @@ -206,30 +204,28 @@ } return "success"; - } - // ////////////////////////////////////////////////// JavaBean dataSource - // /////////////////////////////////////////////////// /** - * javabean做数据源。 + * javabean做数据源，创建报表 + * @return */ public String createReportFromJavaBeanSource() { Map parameters = StrutsParamUtils.getParameters(); - String fileName = "未命名"; try { - String reportName = parameters.get("reportName");// 模块名称，根据不同的报表配置不同的参数 - List dataSourceList = getDataSourceList(reportName,parameters); - JRDataSource dataSource = new JRBeanCollectionDataSource( - dataSourceList); - Map parametMap = getParametMap(reportName); + String reportName = parameters.get("reportName"); //模块名称，根据不同的报表配置不同的参数 + + Map parametMap = getParametMap(reportName); //获取构建报表需要的参数 + List dataSourceList = getDataSourceList(reportName, parameters); //获取报表数据集合 + JRDataSource dataSource = new JRBeanCollectionDataSource(dataSourceList); + JasperReport jasperReport = (JasperReport) JRLoader - .loadObjectFromFile(getJasperReportFileRealPath(parameters)); - JasperPrint jPrint = JasperFillManager.fillReport(jasperReport, - parametMap, dataSource); + .loadObjectFromFile(getJasperReportFileRealPath(parameters)); //创建“jasper文件”的对象实例 + + JasperPrint jPrint = JasperFillManager.fillReport(jasperReport, parametMap, dataSource); StrutsParamUtils.getRequest().getSession() .setAttribute("JasperPrint", jPrint); - fileName = (String) (parametMap.get("title")==null?fileName:parametMap.get("title")); + String fileName = (String) (parametMap.get("title")==null?"未命名":parametMap.get("title")); StrutsParamUtils.getRequest().getSession() .setAttribute("fileName", fileName); } catch (Exception e) { @@ -238,6 +234,11 @@ return "success"; } + /** + * 获取“jasper文件”在服务器的全路径 + * @param parameters http请求的参数 + * @return + */ private String getJasperReportFileRealPath(Map parameters) { String jasperreportName = parameters.get("jasperreportName"); String rootPath = StrutsParamUtils.getRequest().getSession() Index: ssts-web/src/main/webapp/jasperRtp/useRecordItemView.jasper =================================================================== diff -u -r17425 -r17547 Binary files differ