Skip to content

G
gdtel-gztel-school-center
Commit 5bb91d3b by 陈浩建
Options

移动订单导入调整

parent 6b43582c
Showing with 11 additions and 2 deletions
service-manager/src/main/java/com/winsun/controller/OrderController.java
...@@ -701,8 +701,8 @@ public class OrderController extends BaseController { ...@@ -701,8 +701,8 @@ public class OrderController extends BaseController {
@RequestParam(name = "createTimeEnd", required = false) String createTimeEnd, @RequestParam(name = "createTimeEnd", required = false) String createTimeEnd,
@RequestParam(name = "successTimeStart", required = false) String successTimeStart, @RequestParam(name = "successTimeStart", required = false) String successTimeStart,
@RequestParam(name = "successTimeEnd", required = false) String successTimeEnd, @RequestParam(name = "successTimeEnd", required = false) String successTimeEnd,
@RequestParam(name = "kuaidi_timeStart", required = false) String kuaidiTimeStart, @RequestParam(name = "kuaidiTimeStart", required = false) String kuaidiTimeStart,
@RequestParam(name = "kuaidi_timeEnd", required = false) String kuaidiTimeEnd, @RequestParam(name = "kuaidiTimeEnd", required = false) String kuaidiTimeEnd,
@RequestParam("userType") String userType, @RequestParam("userType") String userType,
@RequestParam(name = "orderNumber", required = false) String orderNumber, @RequestParam(name = "orderNumber", required = false) String orderNumber,
@RequestParam(name = "kapin", required = false) String kapin, @RequestParam(name = "kapin", required = false) String kapin,
...@@ -739,6 +739,12 @@ public class OrderController extends BaseController { ...@@ -739,6 +739,12 @@ public class OrderController extends BaseController {
if (StringUtils.isNotBlank(successTimeEnd)) { if (StringUtils.isNotBlank(successTimeEnd)) {
map.put("successTimeEnd", successTimeEnd); map.put("successTimeEnd", successTimeEnd);
} }
if (StringUtils.isNotBlank(kuaidiTimeStart)) {
map.put("kuaidiTimeStart", kuaidiTimeStart);
}
if (StringUtils.isNotBlank(kuaidiTimeEnd)) {
map.put("kuaidiTimeEnd", kuaidiTimeEnd);
}
if (StringUtils.isNotBlank(userType)) { if (StringUtils.isNotBlank(userType)) {
map.put("userType", userType); map.put("userType", userType);
} }
...@@ -911,6 +917,7 @@ public class OrderController extends BaseController { ...@@ -911,6 +917,7 @@ public class OrderController extends BaseController {
tops.add("联系号码"); tops.add("联系号码");
tops.add("订单编号"); tops.add("订单编号");
tops.add("小白卡单号"); tops.add("小白卡单号");
tops.add("预制卡单号");
tops.add("收货地区"); tops.add("收货地区");
tops.add("详细地址"); tops.add("详细地址");
tops.add("配送方式"); tops.add("配送方式");
...@@ -940,6 +947,7 @@ public class OrderController extends BaseController { ...@@ -940,6 +947,7 @@ public class OrderController extends BaseController {
columns.add("contact_number"); columns.add("contact_number");
columns.add("order_number"); columns.add("order_number");
columns.add("xb_order_id"); columns.add("xb_order_id");
columns.add("order_id");
columns.add("site"); columns.add("site");
columns.add("address"); columns.add("address");
columns.add("is_delivery"); columns.add("is_delivery");
...@@ -990,6 +998,7 @@ public class OrderController extends BaseController { ...@@ -990,6 +998,7 @@ public class OrderController extends BaseController {
sheet.setColumnWidth(26, 6500); sheet.setColumnWidth(26, 6500);
sheet.setColumnWidth(27, 6500); sheet.setColumnWidth(27, 6500);
sheet.setColumnWidth(28, 6500); sheet.setColumnWidth(28, 6500);
sheet.setColumnWidth(29, 6500);
//第一行字段名称 //第一行字段名称
tops.forEach(column -> { tops.forEach(column -> {
XSSFCell cell = row.createCell(Math.max(row.getLastCellNum(), 0)); XSSFCell cell = row.createCell(Math.max(row.getLastCellNum(), 0));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment