畜牧资源

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/support/LivestockOwnershipHouseholdExcelExporter.java

@@ -124,6 +124,15 @@ public class LivestockOwnershipHouseholdExcelExporter
 
     private static void clearTemplateDataRegion(Sheet sheet, int fromRow)
     {
+        // 清除表体区域合并（模板合计行曾合并「序号+乡镇+村」）；合计合并稍后由 mergeTotalLabelCells 重建
+        for (int i = sheet.getNumMergedRegions() - 1; i >= 0; i--)
+        {
+            CellRangeAddress region = sheet.getMergedRegion(i);
+            if (region.getFirstRow() >= fromRow)
+            {
+                sheet.removeMergedRegion(i);
+            }
+        }
         int lastRow = sheet.getLastRowNum();
         for (int i = fromRow; i <= lastRow; i++)
         {

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/support/LivestockProductOutputExcelExporter.java

@@ -138,6 +138,15 @@ public class LivestockProductOutputExcelExporter
 
     private static void clearTemplateDataRegion(Sheet sheet, int fromRow)
     {
+        // 清除表体区域合并（模板合计行曾合并「序号+乡镇+村」）；合计合并稍后由 mergeTotalLabelCells 重建
+        for (int i = sheet.getNumMergedRegions() - 1; i >= 0; i--)
+        {
+            CellRangeAddress region = sheet.getMergedRegion(i);
+            if (region.getFirstRow() >= fromRow)
+            {
+                sheet.removeMergedRegion(i);
+            }
+        }
         int lastRow = sheet.getLastRowNum();
         for (int i = fromRow; i <= lastRow; i++)
         {

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/support/YakOutboundReportExcelExporter.java

@@ -125,6 +125,15 @@ public class YakOutboundReportExcelExporter
 
     private static void clearTemplateDataRegion(Sheet sheet, int fromRow)
     {
+        // 清除表体区域合并（模板合计行曾合并「序号+乡镇+村」）；合计合并稍后由 mergeTotalLabelCells 重建
+        for (int i = sheet.getNumMergedRegions() - 1; i >= 0; i--)
+        {
+            CellRangeAddress region = sheet.getMergedRegion(i);
+            if (region.getFirstRow() >= fromRow)
+            {
+                sheet.removeMergedRegion(i);
+            }
+        }
         int lastRow = sheet.getLastRowNum();
         for (int i = fromRow; i <= lastRow; i++)
         {

baqing-admin/src/test/java/com/ruoyi/web/modules/industryservice/support/LivestockOwnershipHouseholdExcelExporterTest.java

@@ -1,17 +1,22 @@
 package com.ruoyi.web.modules.industryservice.support;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.ByteArrayInputStream;
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
 import org.apache.poi.ss.usermodel.BorderStyle;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.ss.usermodel.WorkbookFactory;
+import org.apache.poi.ss.util.CellRangeAddress;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import com.ruoyi.web.modules.industryservice.domain.BizLivestockOwnershipHousehold;
@@ -83,4 +88,58 @@ class LivestockOwnershipHouseholdExcelExporterTest
             }
         }
     }
+
+    @Test
+    @DisplayName("数据行不应继承模板合计行的合并单元格")
+    void exportDataRowsHaveNoMergedTownVillage() throws Exception
+    {
+        List<BizLivestockOwnershipHousehold> list = new ArrayList<>();
+        for (int i = 0; i < 4; i++)
+        {
+            BizLivestockOwnershipHousehold row = new BizLivestockOwnershipHousehold();
+            row.setTownName("雅安镇");
+            row.setVillageDeptId(200L + i);
+            row.setVillageName("测试村" + i);
+            row.setWithLivestockHouseholdCount(10 + i);
+            row.setWithoutLivestockHouseholdCount(1);
+            list.add(row);
+        }
+        byte[] bytes = exporter.export(2026, 5, list, "admin");
+        try (Workbook wb = WorkbookFactory.create(new ByteArrayInputStream(bytes)))
+        {
+            Sheet sheet = LivestockOwnershipHouseholdExcelParser.resolveSheet(wb);
+            int header = LivestockOwnershipHouseholdExcelParser.detectHeaderRow(sheet);
+            int dataStart = header + 2;
+            int totalIdx = dataStart + list.size();
+            for (int r = dataStart; r < totalIdx; r++)
+            {
+                Row row = sheet.getRow(r);
+                assertNotNull(row);
+                assertEquals("雅安镇",
+                        LivestockOwnershipHouseholdExcelParser.cellString(row, LivestockOwnershipHouseholdExcelParser.COL_TOWN));
+                assertTrue(LivestockOwnershipHouseholdExcelParser
+                        .cellString(row, LivestockOwnershipHouseholdExcelParser.COL_VILLAGE).startsWith("测试村"));
+                for (int i = 0; i < sheet.getNumMergedRegions(); i++)
+                {
+                    CellRangeAddress region = sheet.getMergedRegion(i);
+                    assertFalse(region.getFirstRow() <= r && region.getLastRow() >= r
+                                    && region.getFirstColumn() <= LivestockOwnershipHouseholdExcelParser.COL_TOWN
+                                    && region.getLastColumn() >= LivestockOwnershipHouseholdExcelParser.COL_TOWN,
+                            "数据行 " + r + " 不应合并乡镇/村列");
+                }
+            }
+            boolean totalMerged = false;
+            for (int i = 0; i < sheet.getNumMergedRegions(); i++)
+            {
+                CellRangeAddress region = sheet.getMergedRegion(i);
+                if (region.getFirstRow() == totalIdx && region.getLastRow() == totalIdx
+                        && region.getFirstColumn() == 0
+                        && region.getLastColumn() == LivestockOwnershipHouseholdExcelParser.COL_VILLAGE)
+                {
+                    totalMerged = true;
+                }
+            }
+            assertTrue(totalMerged, "仅合计行应合并序号~村三列");
+        }
+    }
 }

baqing-admin/src/test/java/com/ruoyi/web/modules/industryservice/support/LivestockProductOutputExcelTest.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.modules.industryservice.support;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -90,6 +91,53 @@ class LivestockProductOutputExcelTest
         }
     }
 
+    @Test
+    @DisplayName("数据行不应继承模板合计行的合并单元格")
+    void exportDataRowsHaveNoMergedTownVillage() throws Exception
+    {
+        java.util.List<BizLivestockProductOutput> list = new java.util.ArrayList<>();
+        for (int i = 0; i < 4; i++)
+        {
+            list.add(sample("雅安镇", "测试村" + i, "1.0", "2.0"));
+        }
+        byte[] bytes = exporter.export(2026, 5, list, "admin");
+        try (Workbook wb = WorkbookFactory.create(new ByteArrayInputStream(bytes)))
+        {
+            Sheet sheet = LivestockProductOutputExcelParser.resolveSheet(wb);
+            int header = LivestockProductOutputExcelParser.detectHeaderRow(sheet);
+            int dataStart = header + 1;
+            int totalIdx = dataStart + list.size();
+            for (int r = dataStart; r < totalIdx; r++)
+            {
+                Row row = sheet.getRow(r);
+                assertNotNull(row);
+                assertEquals("雅安镇", LivestockProductOutputExcelParser.cellString(row, LivestockProductOutputExcelParser.COL_TOWN));
+                assertTrue(LivestockProductOutputExcelParser.cellString(row, LivestockProductOutputExcelParser.COL_VILLAGE)
+                        .startsWith("测试村"));
+                for (int i = 0; i < sheet.getNumMergedRegions(); i++)
+                {
+                    org.apache.poi.ss.util.CellRangeAddress region = sheet.getMergedRegion(i);
+                    assertFalse(region.getFirstRow() <= r && region.getLastRow() >= r
+                                    && region.getFirstColumn() <= LivestockProductOutputExcelParser.COL_TOWN
+                                    && region.getLastColumn() >= LivestockProductOutputExcelParser.COL_TOWN,
+                            "数据行 " + r + " 不应合并乡镇/村列");
+                }
+            }
+            boolean totalMerged = false;
+            for (int i = 0; i < sheet.getNumMergedRegions(); i++)
+            {
+                org.apache.poi.ss.util.CellRangeAddress region = sheet.getMergedRegion(i);
+                if (region.getFirstRow() == totalIdx && region.getLastRow() == totalIdx
+                        && region.getFirstColumn() == 0
+                        && region.getLastColumn() == LivestockProductOutputExcelParser.COL_VILLAGE)
+                {
+                    totalMerged = true;
+                }
+            }
+            assertTrue(totalMerged, "仅合计行应合并序号~村三列");
+        }
+    }
+
     private static BizLivestockProductOutput sample(String town, String village, String meat, String milk)
     {
         BizLivestockProductOutput row = new BizLivestockProductOutput();

baqing-admin/src/test/java/com/ruoyi/web/modules/industryservice/support/YakOutboundReportExcelExporterTest.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.modules.industryservice.support;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -92,6 +93,54 @@ class YakOutboundReportExcelExporterTest
         }
     }
 
+    @Test
+    @DisplayName("数据行不应继承模板合计行的合并单元格")
+    void exportDataRowsHaveNoMergedTownVillage() throws Exception
+    {
+        java.util.List<BizYakOutboundReport> list = new java.util.ArrayList<>();
+        for (int i = 0; i < 4; i++)
+        {
+            list.add(sample("雅安镇", "测试村" + i, 10 + i, 100 + i));
+        }
+        byte[] bytes = exporter.export(2026, 5, list, "admin");
+        try (org.apache.poi.ss.usermodel.Workbook wb = org.apache.poi.ss.usermodel.WorkbookFactory.create(
+                new ByteArrayInputStream(bytes)))
+        {
+            org.apache.poi.ss.usermodel.Sheet sheet = YakOutboundReportExcelParser.resolveSheet(wb);
+            int header = YakOutboundReportExcelParser.detectHeaderRow(sheet);
+            int dataStart = header + 1;
+            int totalIdx = dataStart + list.size();
+            for (int r = dataStart; r < totalIdx; r++)
+            {
+                org.apache.poi.ss.usermodel.Row row = sheet.getRow(r);
+                assertNotNull(row);
+                assertEquals("雅安镇", YakOutboundReportExcelParser.cellString(row, YakOutboundReportExcelParser.COL_TOWN));
+                assertTrue(YakOutboundReportExcelParser.cellString(row, YakOutboundReportExcelParser.COL_VILLAGE_NAME)
+                        .startsWith("测试村"));
+                for (int i = 0; i < sheet.getNumMergedRegions(); i++)
+                {
+                    org.apache.poi.ss.util.CellRangeAddress region = sheet.getMergedRegion(i);
+                    assertFalse(region.getFirstRow() <= r && region.getLastRow() >= r
+                                    && region.getFirstColumn() <= YakOutboundReportExcelParser.COL_TOWN
+                                    && region.getLastColumn() >= YakOutboundReportExcelParser.COL_TOWN,
+                            "数据行 " + r + " 不应合并乡镇/村列");
+                }
+            }
+            boolean totalMerged = false;
+            for (int i = 0; i < sheet.getNumMergedRegions(); i++)
+            {
+                org.apache.poi.ss.util.CellRangeAddress region = sheet.getMergedRegion(i);
+                if (region.getFirstRow() == totalIdx && region.getLastRow() == totalIdx
+                        && region.getFirstColumn() == 0
+                        && region.getLastColumn() == YakOutboundReportExcelParser.COL_VILLAGE_NAME)
+                {
+                    totalMerged = true;
+                }
+            }
+            assertTrue(totalMerged, "仅合计行应合并序号~村三列");
+        }
+    }
+
     private static BizYakOutboundReport sample(String town, String village, int households, int yak)
     {
         BizYakOutboundReport report = new BizYakOutboundReport();