解决导出Excel问题

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/controller/SyLetterDepositController.java

@@ -564,7 +564,7 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 	  * @return
 	  */
 	 @RequestMapping(value = "/printSyletterDeposit")
-	 public Result<SyLetterDeposit> printSyletterDeposit(String id,HttpServletResponse response){
+	 public void printSyletterDeposit(String id,HttpServletResponse response){
 
 		 Result<SyLetterDeposit> result = new Result<SyLetterDeposit>();
 
@@ -668,6 +668,8 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 			 TemplateExportParams params = new TemplateExportParams("D:\\单证模板\\预托书数据.xlsx");
 
 			 Workbook workbook = ExcelExportUtil.exportExcel(params, map);
+			 response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+			 response.setCharacterEncoding("utf-8");
 			 ServletOutputStream outputStream = response.getOutputStream();
 
 			 workbook.write(outputStream);
@@ -681,7 +683,7 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 
 		 result.setSuccess(true);
 		 result.setMessage("打印成功！");
-		 return result;
+		// return result;
 	 }
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/controller/SyShippingDetailsController.java

@@ -472,7 +472,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
   @AutoLog(value = "发运明细主表-导出")
   @ApiOperation(value="发运明细主表-导出", notes="发运明细主表-导出")
   @GetMapping(value = "/exportXls")
-  public Result<String> exportXls(SyShippingDetailsVo syShippingDetails,
+  public void exportXls(SyShippingDetailsVo syShippingDetails,
 								@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								HttpServletResponse req) {
@@ -558,11 +558,12 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 			  //集合转map
 			  for(SyShippingDetailsVo li:itemList){
 
-			  	if(oConvertUtils.isEmpty(li.getElementsId())){
-					result.setSuccess(false);
-					result.setMessage("报关要素未维护，不允许导出！");
-					return result;
-				}
+			  	//2023.03.21去掉，有预装箱单那边判断
+//			  	if(oConvertUtils.isEmpty(li.getElementsId())){
+//					result.setSuccess(false);
+//					result.setMessage("报关要素未维护，不允许导出！");
+//					return result;
+//				}
 				  if(oConvertUtils.isEmpty(li.getGarmentFactory())){
 					  li.setGarmentFactory(" ");
 				  }
@@ -614,7 +615,8 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 			  map.put("createTime",itemList.get(0).getCreateTime());
 
 			  Workbook workbook = ExcelExportUtil.exportExcel(params,map);
-
+			  req.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+			  req.setCharacterEncoding("utf-8");
 			  ServletOutputStream outputStream = req.getOutputStream();
 
 			  workbook.write(outputStream);
@@ -623,12 +625,12 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 		  }else{//成衣
 			  IPage<SyShippingDetailsVo> pageList = syShippingDetailsService.queryShippingDetails(page, queryWrapper);
 			  for(SyShippingDetailsVo li:pageList.getRecords()){
-				  if(oConvertUtils.isEmpty(li.getElementsId())){
-					  result.setSuccess(false);
-					  result.setMessage("报关要素未维护，不允许导出！");
-					  return result;
-
-				  }
+//				  if(oConvertUtils.isEmpty(li.getElementsId())){
+//					  result.setSuccess(false);
+//					  result.setMessage("报关要素未维护，不允许导出！");
+//					  return result;
+//
+//				  }
 				  String pre = sf.format(li.getPreDeliveryDate());
 				  //用到货日期代替一下预发货日期
 				  li.setArrivalDate(pre);
@@ -769,6 +771,8 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 				  }
 				  index++;
 			  }
+			  req.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+			  req.setCharacterEncoding("utf-8");
 			  ServletOutputStream outputStream = req.getOutputStream();
 			  workbook.write(outputStream);
 		  }
@@ -785,7 +789,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 	  result.setMessage("导出成功！");
 	  result.setResult("导出成功！");
 
-	  return result;
+	 // return result;
 
   }
 
@@ -1362,7 +1366,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 	  * @return
 	  */
 	 @RequestMapping(value = "/exportXlsShipping")
-	 public Result<List<SyShippingDetailsVo>> exportXlsShipping(SyShippingDetailsVo syShippingDetails,String startTime,String endTime,String flourOrGarment,
+	 public void exportXlsShipping(SyShippingDetailsVo syShippingDetails,String startTime,String endTime,String flourOrGarment,
 									   String refer,String preDeliveryDateB,String preDeliveryDateE,String supplier,String isElement,
 									   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 									   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -1470,8 +1474,10 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 			 map.put("price",price);
 			 map.put("item", listMap);
 
+			 //sheet.createFreezePane(0, 1, 0, 1);
 			 Workbook workbook = ExcelExportUtil.exportExcel(params, map);
-
+			 req.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+			 req.setCharacterEncoding("utf-8");
 			 ServletOutputStream outputStream = req.getOutputStream();
 
 			 workbook.write(outputStream);
@@ -1486,7 +1492,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 		 result.setMessage("导出成功！");
 		 result.setResult(pageList.getRecords());
 
-		 return result;
+		 //return result;
 	 }
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/controller/SyShippingOrderController.java

@@ -573,7 +573,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 	 @AutoLog(value = "发票打印")
 	 @ApiOperation(value = "发票打印")
 	 @RequestMapping(value = "/syShippingOrderPrint")
-	 public Result<SyShippingOrder> syShippingOrderPrint(String id,String testName,String isAhaa,HttpServletResponse response)  throws ParseException {
+	 public void syShippingOrderPrint(String id,String testName,String isAhaa,HttpServletResponse response)  throws ParseException {
 
 		 Result<SyShippingOrder> result= new Result<SyShippingOrder>();
          String readyFabric = "";
@@ -721,7 +721,8 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 					 map.put("item", listMap);
 
 					 Workbook workbook = ExcelExportUtil.exportExcel(params, map);
-
+					 response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+					 response.setCharacterEncoding("utf-8");
 					 ServletOutputStream outputStream = response.getOutputStream();
 
 					 workbook.write(outputStream);
@@ -823,6 +824,8 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 					 map.put("list", listMap);
 
 					 Workbook workbook = ExcelExportUtil.exportExcel(params, map);
+					 response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+					 response.setCharacterEncoding("utf-8");
 					 ServletOutputStream outputStream = response.getOutputStream();
 					 workbook.write(outputStream);
 
@@ -896,6 +899,8 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 					 map.put("list", maiTouList);
 
 					 Workbook workbook = ExcelExportUtil.exportExcel(params, map);
+					 response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+					 response.setCharacterEncoding("utf-8");
 					 ServletOutputStream outputStream = response.getOutputStream();
 					 workbook.write(outputStream);
 
@@ -951,6 +956,8 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 					 map.put("item", listMap);
 
 					 Workbook workbook = ExcelExportUtil.exportExcel(params, map);
+					 response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+					 response.setCharacterEncoding("utf-8");
 					 ServletOutputStream outputStream = response.getOutputStream();
 					 workbook.write(outputStream);
 
@@ -1011,6 +1018,8 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 					 map.put("list", maiTouList);
 
 					 Workbook workbook = ExcelExportUtil.exportExcel(params, map);
+					 response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+					 response.setCharacterEncoding("utf-8");
 					 ServletOutputStream outputStream = response.getOutputStream();
 					 workbook.write(outputStream);
 
@@ -1081,6 +1090,8 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 
 
 					 Workbook workbook = ExcelExportUtil.exportExcel(params, map);
+					 response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+					 response.setCharacterEncoding("utf-8");
 					 ServletOutputStream outputStream = response.getOutputStream();
 					 workbook.write(outputStream);
 				 }
@@ -1112,7 +1123,8 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 					 map.put("item", listMap);
 
 					 Workbook workbook = ExcelExportUtil.exportExcel(params, map);
-
+					 response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+					 response.setCharacterEncoding("utf-8");
 					 ServletOutputStream outputStream = response.getOutputStream();
 
 					 workbook.write(outputStream);
@@ -1174,6 +1186,8 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 					 map.put("list", maiTouList);
 
 					 Workbook workbook = ExcelExportUtil.exportExcel(params, map);
+					 response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+					 response.setCharacterEncoding("utf-8");
 					 ServletOutputStream outputStream = response.getOutputStream();
 					 workbook.write(outputStream);
 
@@ -1267,6 +1281,8 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 					 map.put("list", maiTouList);
 
 					 Workbook workbook = ExcelExportUtil.exportExcel(params, map);
+					 response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+					 response.setCharacterEncoding("utf-8");
 					 ServletOutputStream outputStream = response.getOutputStream();
 					 workbook.write(outputStream);
 
@@ -1314,6 +1330,8 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 					 map.put("list", mergeMap);
 
 					 Workbook workbook = ExcelExportUtil.exportExcel(params, map);
+					 response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+					 response.setCharacterEncoding("utf-8");
 					 ServletOutputStream outputStream = response.getOutputStream();
 					 workbook.write(outputStream);
 
@@ -1333,7 +1351,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 
 		 }
 
-		 return result;
+		 //return result;
 	 }