Forráskód Böngészése

开票导出和筛选项修改

user5 3 éve
szülő
commit
680c89e68a

+ 3 - 3
src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceAllController.java

@@ -712,14 +712,14 @@ public class WorkInvoiceAllController extends BaseController {
     public String exportFile(WorkInvoice workInvoice, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
 		try {
             String fileName = "发票管理"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
-            Page<WorkInvoice> page = workInvoiceService.findPage(new Page<WorkInvoice>(request, response, -1), workInvoice);
+            Page<WorkInvoice> page = workInvoiceService.findListExport(new Page<WorkInvoice>(request, response, -1), workInvoice);
 			List<WorkInvoice> workInvoiceList = page.getList();
-			for (WorkInvoice invoice: workInvoiceList) {
+			/*for (WorkInvoice invoice: workInvoiceList) {
 				invoice.setWorkInvoiceProjectRelationList(workInvoiceService.getProjectRelation(invoice));
 				List<String> projectNameList = workInvoiceService.getProjectNameList(invoice);
 				String projectNameStr = String.join(",", projectNameList);
 				invoice.setProjectName(projectNameStr);
-			}
+			}*/
             new ExportExcel("发票管理", WorkInvoice.class).setDataList(page.getList()).write(response, fileName).dispose();
     		return null;
 		} catch (Exception e) {