From 2836006e242bd255bccd62dd23cecc96778e9124 Mon Sep 17 00:00:00 2001 From: duhui Date: Mon, 25 Oct 2021 14:44:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8A=A5=E9=94=99=E5=85=BC?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jmfy/controller/OrderInfoController.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/jmfy/controller/OrderInfoController.java b/src/main/java/com/jmfy/controller/OrderInfoController.java index 38f6225..d312c36 100644 --- a/src/main/java/com/jmfy/controller/OrderInfoController.java +++ b/src/main/java/com/jmfy/controller/OrderInfoController.java @@ -6,7 +6,6 @@ import com.jmfy.WebSecurityConfig; import com.jmfy.dao.*; import com.jmfy.model.*; import com.jmfy.redisProperties.RedisUserKey; - import com.jmfy.utils.*; import config.SRechargeCommodityConfig; import org.apache.poi.hssf.usermodel.*; @@ -16,7 +15,6 @@ import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; @@ -28,8 +26,6 @@ import java.lang.reflect.Method; import java.math.BigDecimal; import java.net.HttpURLConnection; import java.net.URL; -import java.text.DateFormat; -import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -76,6 +72,9 @@ public class OrderInfoController { long endTime = DateUtil.timeToStamp(parameterMap.get("endTime").replace("T"," ")); List cgPayOrders = findOrders(startTime, endTime, userId, "ALLORDER", "0"); + if(cgPayOrders.isEmpty()){ + throw new Exception("订单查询数据为空,导出失败!"); + } createOrderExcel(request,response,cgPayOrders); } @@ -181,7 +180,7 @@ public class OrderInfoController { }); } // 礼包内容文字化 - corder.setProductContent(builder.substring(0,builder.length()-1).toString()); + corder.setProductContent(builder.substring(0,builder.length()).toString()); } // 用户信息获取 GSUserFinal gsUser = gsUserDao.findUserInfoCache(server,Integer.valueOf(accountid)); @@ -207,12 +206,11 @@ public class OrderInfoController { session.setAttribute("state", null); // 生成提示信息, response.setContentType("application/csv;charset=gbk"); - String codedFileName = null; OutputStream fOut = null; try { // 进行转码,使其支持中文文件名 - codedFileName = java.net.URLEncoder.encode("订单信息", "UTF-8"); + String codedFileName = java.net.URLEncoder.encode("订单信息", "UTF-8"); response.addHeader("Content-Disposition", "attachment; filename=" + codedFileName + ".xls"); // 产生工作簿对象 HSSFWorkbook workbook = new HSSFWorkbook(); @@ -224,7 +222,7 @@ public class OrderInfoController { Field[] field = cgPayOrders.get(0).getClass().getDeclaredFields(); //创建一行 HSSFRow headerRow = sheet.createRow(0); - while (cellIndex