Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportFormsManagerImpl.java
===================================================================
diff -u -r31210 -r31224
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportFormsManagerImpl.java (.../ReportFormsManagerImpl.java) (revision 31210)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportFormsManagerImpl.java (.../ReportFormsManagerImpl.java) (revision 31224)
@@ -388,12 +388,8 @@
}
}
@Override
- public void exportHtmlTable(HttpServletRequest request, OutputStream ops, String jsFileName) {
+ public void exportHtmlTable(HttpServletRequest request, OutputStream ops, String jsFileName, String htmlTable) {
try{
- String htmlTable = request.getParameter("htmlTable");
- if(StringUtils.isBlank(htmlTable)){
- htmlTable = (String)(request.getSession().getAttribute("htmlTable"));
- }
if(StringUtils.isNotBlank(htmlTable)){
ScriptEngineManager manager = new ScriptEngineManager();
ScriptEngine engine = manager.getEngineByName("javascript");
@@ -524,8 +520,6 @@
BASE64Decoder decoder = new BASE64Decoder();
htmlTable = new String(decoder.decodeBuffer(htmlTable));
htmlTable = java.net.URLDecoder.decode(htmlTable,"UTF-8");
- //htmlTable = "| 日期 | 平面器械类 | 齿类器械类 | 剪刀器械类 | 结构复杂类 | 腔镜器械类 | 管腔器械类 | 牙科手机类 | 牙科小器械 | 电动工具类 | 外来器械类 | 其他器械类 | 未设置 | 玻璃 | 敷料 | 棉布 | 木质 | 平面类器械 | 塑料 | 橡胶 | 合计 |
| 清洗数量 | 不合格数 | 不合格率 |
| 2020-04-01 | 1948 | 43 | 0.0221% | 2067 | 23 | 0.0111% | 215 | 2 | 0.0093% | 506 | 0 | 0.0000% | 58 | 0 | 0.0000% | 172 | 0 | 0.0000% | 25 | 0 | 0.0000% | 221 | 0 | 0.0000% | 16 | 0 | 0.0000% | 376 | 0 | 0.0000% | 12 | 0 | 0.0000% | 20 | 0 | 0.0000% | 2 | 0 | 0.0000% | 1406 | 0 | 0.0000% | 2 | 0 | 0.0000% | 3 | 0 | 0.0000% | 39 | 0 | 0.0000% | 266 | 0 | 0.0000% | 1490 | 0 | 0.0000% | 8844 | 68 | 0.0425% |
| 合计 | 1948 | 43 | 0.0221% | 2067 | 23 | 0.0111% | 215 | 2 | 0.0093% | 506 | 0 | 0.0000% | 58 | 0 | 0.0000% | 172 | 0 | 0.0000% | 25 | 0 | 0.0000% | 221 | 0 | 0.0000% | 16 | 0 | 0.0000% | 376 | 0 | 0.0000% | 12 | 0 | 0.0000% | 20 | 0 | 0.0000% | 2 | 0 | 0.0000% | 1406 | 0 | 0.0000% | 2 | 0 | 0.0000% | 3 | 0 | 0.0000% | 39 | 0 | 0.0000% | 266 | 0 | 0.0000% | 1490 | 0 | 0.0000% | 8844 | 68 | 0.0425% |
";
- //System.out.println("htmlTable:"+htmlTable);
ConvertHtml2Excel.table2Excel(row2 + 2, wb, sheet, htmlTable);
out = response.getOutputStream();
response.setContentType("application/vnd.ms-excel");
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportFormsManager.java
===================================================================
diff -u -r31206 -r31224
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportFormsManager.java (.../ReportFormsManager.java) (revision 31206)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportFormsManager.java (.../ReportFormsManager.java) (revision 31224)
@@ -23,8 +23,9 @@
* @param request
* @param ops OutputStream
* @param jsFileName js文件名
+ * @param htmlTable
*/
- public void exportHtmlTable(HttpServletRequest request,OutputStream ops, String jsFileName);
+ public void exportHtmlTable(HttpServletRequest request,OutputStream ops, String jsFileName, String htmlTable);
/**
* 导出图片到excel
* @param fileContent 图片内容