订单合并

sd-business/src/main/java/com/sd/business/service/statement/impl/DocumentByOrderExcelCellMergeStrategy.java

@@ -69,7 +69,7 @@ public class DocumentByOrderExcelCellMergeStrategy extends AbstractMergeStrategy
         // 合并订单列
         if (orderColIndex.contains(curColIndex)) {
             for (int i = 1; i < orderRowIndex.size(); i++) {
-                Integer beginRow = orderRowIndex.get(i - 1);
+                Integer beginRow = orderRowIndex.get(i - 1) + 1;
                 Integer endRow = orderRowIndex.get(i);
                 mergeWithPrevRow(sheet, beginRow, endRow, curColIndex);
             }
@@ -78,7 +78,7 @@ public class DocumentByOrderExcelCellMergeStrategy extends AbstractMergeStrategy
         // 合并sku列
         else if (skuColIndex.contains(curColIndex)) {
             for (int i = 1; i < skuRowIndex.size(); i++) {
-                Integer beginRow = skuRowIndex.get(i - 1);
+                Integer beginRow = skuRowIndex.get(i - 1) + 1;
                 Integer endRow = skuRowIndex.get(i);
                 mergeWithPrevRow(sheet, beginRow, endRow, curColIndex);
             }
@@ -90,10 +90,10 @@ public class DocumentByOrderExcelCellMergeStrategy extends AbstractMergeStrategy
      * 合并单元格
      */
     private void mergeWithPrevRow(Sheet sheet, int beginRow, int endRow, int col) {
-        if (beginRow + 1 == endRow) {
+        if (beginRow == endRow) {
             return;
         }
-        CellRangeAddress cellRangeAddress = new CellRangeAddress(beginRow + 1, endRow, col, col);
+        CellRangeAddress cellRangeAddress = new CellRangeAddress(beginRow, endRow, col, col);
         sheet.addMergedRegionUnsafe(cellRangeAddress);
     }