解决白坯布预测导出报错

jjt-biz/src/main/java/com/jjt/order/controller/OrderApiController.java

@@ -57,7 +57,7 @@ public class OrderApiController extends BaseController {
     }
 
     @ApiOperation("导出白坯预测")
-    @GetMapping("/api/export/order")
+    @RequestMapping("/api/export/order")
     @CrossOrigin(origins = "*")
     public void orderExport(String start, String end, HttpServletResponse response) {
         //查询订单

jjt-biz/src/main/java/com/jjt/order/utils/OrderExportUtil.java

@@ -315,8 +315,10 @@ public class OrderExportUtil {
                 }
                 out = true;
                 int eer = num.get() - 1;
-                for (int i = 8; i < 12; i++) {
-                    sheet.addMergedRegion(new CellRangeAddress(ssr, eer, i, i));
+                if (eer - ssr > 1) {
+                    for (int i = 8; i < 12; i++) {
+                        sheet.addMergedRegion(new CellRangeAddress(ssr, eer, i, i));
+                    }
                 }
             }
             int er = num.get() - 1;
@@ -387,8 +389,10 @@ public class OrderExportUtil {
                 xql.setCellStyle(p2);
                 out = true;
                 int eer = num.get() - 1;
-                for (int i = 7; i < 12; i++) {
-                    sheet.addMergedRegion(new CellRangeAddress(ssr, eer, i, i));
+                if (eer - ssr > 1) {
+                    for (int i = 7; i < 12; i++) {
+                        sheet.addMergedRegion(new CellRangeAddress(ssr, eer, i, i));
+                    }
                 }
             }
             int er = num.get() - 1;

jjt-biz/src/main/java/com/jjt/order/utils/OrderGsmExportUtil.java

@@ -320,8 +320,10 @@ public class OrderGsmExportUtil {
                 }
                 out = true;
                 int eer = num.get() - 1;
-                for (int i = 10; i < 14; i++) {
-                    sheet.addMergedRegion(new CellRangeAddress(ssr, eer, i, i));
+                if (eer - ssr > 1) {
+                    for (int i = 10; i < 14; i++) {
+                        sheet.addMergedRegion(new CellRangeAddress(ssr, eer, i, i));
+                    }
                 }
             }
             int er = num.get() - 1;
@@ -393,8 +395,10 @@ public class OrderGsmExportUtil {
                 xql.setCellStyle(p2);
                 out = true;
                 int eer = num.get() - 1;
-                for (int i = 8; i < 12; i++) {
-                    sheet.addMergedRegion(new CellRangeAddress(ssr, eer, i, i));
+                if (eer - ssr > 1) {
+                    for (int i = 8; i < 12; i++) {
+                        sheet.addMergedRegion(new CellRangeAddress(ssr, eer, i, i));
+                    }
                 }
             }
             int er = num.get() - 1;