generated from root/miduo_server
订单导出bug修改
parent
f13a63a071
commit
b239eb0e11
|
@ -54,7 +54,8 @@ public class OrderInfoController {
|
|||
|
||||
@RequestMapping(value = "/getOrder", method = {RequestMethod.POST, RequestMethod.GET})
|
||||
public String getOrder(HttpServletRequest request, ModelMap map) throws Exception {
|
||||
List<Corder> cgPayOrders = findOrders(request);
|
||||
HashMap<String, String> parameterMap = JsonUtil.getInstence().getParameterMap(request);
|
||||
List<Corder> cgPayOrders = findOrders(parameterMap);
|
||||
map.put("cgPayOrders",cgPayOrders);
|
||||
return "userOrderInfo";
|
||||
}
|
||||
|
@ -63,11 +64,12 @@ public class OrderInfoController {
|
|||
public @ResponseBody
|
||||
int exportExcelRequest(HttpServletRequest request) throws Exception {
|
||||
String name = request.getParameter("name");
|
||||
HashMap<String, String> parameterMap = JsonUtil.getInstence().getParameterMap(request);
|
||||
TaskKit.scheduleWithFixedOne(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
try {
|
||||
List<Corder> orders = findOrders(request);
|
||||
List<Corder> orders = findOrders(parameterMap);
|
||||
exportOrderExcel(name,orders);
|
||||
} catch (Exception e) {
|
||||
LoginController.addQueue("订单列表《"+name+"》导出报错2:"+e.getMessage());
|
||||
|
@ -184,9 +186,8 @@ public class OrderInfoController {
|
|||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
private List<Corder> findOrders(HttpServletRequest request) throws Exception {
|
||||
private List<Corder> findOrders(HashMap<String, String> parameterMap) throws Exception {
|
||||
// 参数
|
||||
HashMap<String, String> parameterMap = JsonUtil.getInstence().getParameterMap(request);
|
||||
long startTime = DateUtil.timeToStamp2(parameterMap.get("startTime").replace("T"," "));
|
||||
long endTime = DateUtil.timeToStamp2(parameterMap.get("endTime").replace("T"," "));
|
||||
String serverId = parameterMap.get("serverId");
|
||||
|
|
Loading…
Reference in New Issue