经营报表修改

mec-web/src/main/java/com/ym/mec/web/controller/OperatingReportController.java

@@ -92,6 +92,7 @@ public class OperatingReportController extends BaseController {
             }
         }
         queryInfo.setRows(65000);
+        queryInfo.setType("organ");
         PageInfo<OperatingReport> pageList = operatingReportService.queryPage(queryInfo);
         if (pageList.getTotal() <= 0) {
             response.setStatus(200);
@@ -103,14 +104,16 @@ public class OperatingReportController extends BaseController {
         OutputStream outputStream = response.getOutputStream();
         try {
 
-            String[] header = {"分部","销售收入（元）","服务收入（元）","业务退费（元）","收入合计（元）","销售成本（元）","固定支出（元）", "变动支出（元）", "分摊费用（元）", "成本费用合计（元）", "利润（元）"};
-            String[] body = {"organName", "schoolName", "sellAmount", "serviceAmount", "refundAmount", "incomeTotal", "sellCost","expensesAmount","variableCost","distributionAmount","costAmount","profit"};
-            HSSFWorkbook workbook = POIUtil.multipleSheetExportExcel(header, body, pageList.getRows(),null);
+            String[] header = {"分部", "销售收入（元）", "服务收入（元）", "业务退费（元）", "收入合计（元）", "销售成本（元）", "固定支出（元）", "变动支出（元）", "分摊费用（元）", "成本费用合计（元）", "利润（元）"};
+            String[] body = {"organName", "sellAmount", "serviceAmount", "refundAmount", "incomeTotal", "sellCost", "expensesAmount", "variableCost", "distributionAmount", "costAmount", "profit"};
+            HSSFWorkbook workbook = POIUtil.multipleSheetExportExcel(header, body, pageList.getRows(), null);
 
 
-            String[] header2 = {"分部","学校","销售收入（元）","服务收入（元）","业务退费（元）","收入合计（元）","销售成本（元）","固定支出（元）", "变动支出（元）", "分摊费用（元）", "成本费用合计（元）", "利润（元）"};
-            String[] body2 = {"organName", "schoolName", "sellAmount", "serviceAmount", "refundAmount", "incomeTotal", "sellCost","expensesAmount","variableCost","distributionAmount","costAmount","profit"};
-            HSSFWorkbook workbook2 = POIUtil.exportExcel(header, body, pageList.getRows());
+            queryInfo.setType("school");
+            pageList = operatingReportService.queryPage(queryInfo);
+            String[] header2 = {"分部", "学校", "销售收入（元）", "服务收入（元）", "业务退费（元）", "收入合计（元）", "销售成本（元）", "固定支出（元）", "变动支出（元）", "分摊费用（元）", "成本费用合计（元）", "利润（元）"};
+            String[] body2 = {"organName", "schoolName", "sellAmount", "serviceAmount", "refundAmount", "incomeTotal", "sellCost", "expensesAmount", "variableCost", "distributionAmount", "costAmount", "profit"};
+            workbook = POIUtil.multipleSheetExportExcel(header2, body2, pageList.getRows(), workbook);
 
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=cooperationOrgan-" + DateUtil.getDate(new Date()) + ".xls");