Index: ssts-web/src/main/webapp/homepage/exportOperateData.jsp =================================================================== diff -u -r27802 -r27993 --- ssts-web/src/main/webapp/homepage/exportOperateData.jsp (.../exportOperateData.jsp) (revision 27802) +++ ssts-web/src/main/webapp/homepage/exportOperateData.jsp (.../exportOperateData.jsp) (revision 27993) @@ -5,6 +5,7 @@ <% String goodNmae = request.getParameter("goodNmae"); String tousseType = request.getParameter("tousseType"); +String comboTousseType = request.getParameter("comboTousseType"); String department = request.getParameter("department"); String startDate = request.getParameter("startDate"); String endDate = request.getParameter("endDate"); @@ -16,8 +17,8 @@ response.setContentType("application/octet-stream"); response.addHeader("Content-Disposition","attachment;filename=" + new String(fileName.getBytes("GBK"), "ISO8859_1")); SupplyRoomControlManager supplyRoomControlManager = (SupplyRoomControlManager)SpringBeanManger.getBean("supplyRoomControlManager"); -supplyRoomControlManager.createOperateData(servletOutputStream,goodNmae,tousseType,department,startDate,endDate,orgUnitCoding); +supplyRoomControlManager.createOperateData(request,servletOutputStream,goodNmae,tousseType,department,startDate,endDate,orgUnitCoding,comboTousseType); servletOutputStream.flush(); out.clear(); out = pageContext.pushBody(); -%> \ No newline at end of file +%>