优化导入功能

70c7a80d · 黄森林 · 6b06d1ed · 70c7a80d
Commit 70c7a80d authored Mar 11, 2020 by 黄森林
Show whitespace changes
Inline Side-by-side

Showing with 35 additions and 19 deletions

service-manager/src/main/java/com/winsun/controller/OrderController.java
+35 -19

No files found.
--- a/service-manager/src/main/java/com/winsun/controller/OrderController.java
+++ b/service-manager/src/main/java/com/winsun/controller/OrderController.java
@@ -52,8 +52,25 @@ import org.springframework.web.multipart.MultipartFile;
 @RequestMapping("/order")
 public class OrderController extends BaseController {
+    /**
+     * 导入
+     */
    private static final int HEADER_NUM = -1;
    private static final int SHEET_INDEX = 0;
+    /**
+     * 受理单模板列名
+     */
+    private static String SL_ORDERNUMBER = "订单编号(必填)";
+    private static String SL_ACCEPTRESULT = "受理结果(必填)";
+    private static String SL_ACCEPTNAME = "受理人(必填)";
+    private static String SL_ACCERPCOMMENT = "备注（受理不成功需填写不成功原因）";
+    /**
+     * 快递清单模板列名
+     */
+    private static String KD_ORDERNUMBER = "订单编号(必填)";
+    private static String SL_SENDTYPE = "快递方式(必填)";
+    private static String SL_COMPANY = "快递公司(快递方式为快递必须填写)";
+    private static String SL_KUAIDORDER = "快递单号(快递方式为快递必须填写)";
    private static OrderMapper orderMapper;
@@ -88,9 +105,9 @@ public class OrderController extends BaseController {
        Wrapper wrapper = new EntityWrapper<>();
        wrapper.eq("id", orderId);
        Map<String, Object> dataMapping = new HashMap<>();
-        dataMapping.put("order_status","异常单");
+        dataMapping.put("order_status", "异常单");
        Integer integer = orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
-        if(integer == 1){
+        if (integer == 1) {
            return ResponseData.success("设为异常单成功！");
        }
        return ResponseData.error("设为异常单失败！");
@@ -429,17 +446,16 @@ public class OrderController extends BaseController {
        if (listMap.size() == 1) {
            return ResponseData.error("文件不能为空");
        }
+        if (!listMap.get(0).get("a").toString().equals(SL_ORDERNUMBER)) {
-        if (!listMap.get(0).get("a").toString().equals("订单编号(必填)")) {
            return ResponseData.error("模板不对，请选择正确的模板！");
        }
-        if (!listMap.get(0).get("b").toString().equals("受理结果(必填)")) {
+        if (!listMap.get(0).get("b").toString().equals(SL_ACCEPTRESULT)) {
            return ResponseData.error("模板不对，请选择正确的模板！");
        }
-        if (!listMap.get(0).get("c").toString().equals("受理人(必填)")) {
+        if (!listMap.get(0).get("c").toString().equals(SL_ACCEPTNAME)) {
            return ResponseData.error("模板不对，请选择正确的模板！");
        }
-        if (!listMap.get(0).get("d").toString().equals("备注（受理不成功需填写不成功原因）")) {
+        if (!listMap.get(0).get("d").toString().equals(SL_ACCERPCOMMENT)) {
            return ResponseData.error("模板不对，请选择正确的模板！");
        }
        if (listMap.get(0).size() != 4) {
@@ -562,16 +578,16 @@ public class OrderController extends BaseController {
        if (listMap.get(0).size() != 4) {
            return ResponseData.error("模板不对，请选择正确的模板！");
        }
-        if (!listMap.get(0).get("a").toString().equals("订单编号(必填)")) {
+        if (!listMap.get(0).get("a").toString().equals(KD_ORDERNUMBER)) {
            return ResponseData.error("模板不对，请选择正确的模板！");
        }
-        if (!listMap.get(0).get("b").toString().equals("快递方式(必填)")) {
+        if (!listMap.get(0).get("b").toString().equals(SL_SENDTYPE)) {
            return ResponseData.error("模板不对，请选择正确的模板！");
        }
-        if (!listMap.get(0).get("c").toString().equals("快递公司(快递方式为快递必须填写)")) {
+        if (!listMap.get(0).get("c").toString().equals(SL_COMPANY)) {
            return ResponseData.error("模板不对，请选择正确的模板！");
        }
-        if (!listMap.get(0).get("d").toString().equals("快递单号(快递方式为快递必须填写)")) {
+        if (!listMap.get(0).get("d").toString().equals(SL_KUAIDORDER)) {
            return ResponseData.error("模板不对，请选择正确的模板！");
        }
@@ -665,10 +681,10 @@ public class OrderController extends BaseController {
    @Permission(menuname = "受理单导入模板", method = RequestMethod.POST, value = "downloadMoBan")
    public ResponseData downloadMoBan() {
        ArrayList<String> columns = new ArrayList<>();
-        columns.add("订单编号(必填)");
+        columns.add(SL_ORDERNUMBER);
-        columns.add("受理结果(必填)");
+        columns.add(SL_ACCEPTRESULT);
-        columns.add("受理人(必填)");
+        columns.add(SL_ACCEPTNAME);
-        columns.add("备注（受理不成功需填写不成功原因）");
+        columns.add(SL_ACCERPCOMMENT);
        ServletOutputStream os = null;
        XSSFWorkbook workbook = new XSSFWorkbook();
        try {
@@ -710,10 +726,10 @@ public class OrderController extends BaseController {
    @Permission(menuname = "快递导入模板", method = RequestMethod.POST, value = "downloadMoBanKD")
    public ResponseData downloadMoBanKD() {
        ArrayList<String> columns = new ArrayList<>();
-        columns.add("订单编号(必填)");
+        columns.add(KD_ORDERNUMBER);
-        columns.add("快递方式(必填)");
+        columns.add(SL_SENDTYPE);
-        columns.add("快递公司(快递方式为快递必须填写)");
+        columns.add(SL_COMPANY);
-        columns.add("快递单号(快递方式为快递必须填写)");
+        columns.add(SL_KUAIDORDER);
        ServletOutputStream os = null;
        XSSFWorkbook workbook = new XSSFWorkbook();
        try {