畜牧资源

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

@@ -125,6 +125,8 @@ public class YakHerdInventoryExcelExporter
             updateTitleYearMonth(sheet, statYear, statMonth);
             updateFiller(sheet, fillerName);
             int dataStartRow = headerRowIndex + 3;
+            CellStyle[] dataRowStyles = captureDataRowStyles(sheet, dataStartRow);
+            Float dataRowHeight = captureRowHeight(sheet, dataStartRow);
             clearTemplateDataRegion(sheet, dataStartRow);
             Totals totals = new Totals();
             int rowIndex = dataStartRow;
@@ -142,6 +144,7 @@ public class YakHerdInventoryExcelExporter
                     setIntegerCell(row, COL_SEQ, seq++);
                     setStringCell(row, YakHerdInventoryExcelParser.COL_TOWN, inv.getTownName());
                     fillDataRow(row, inv);
+                    applyDataRowStyles(row, dataRowStyles, dataRowHeight);
                     if (inv.getVillageDeptId() != null || inv.getYakTotal() != null || inv.getBullTotal() != null
                             || inv.getCowTotal() != null || inv.getGrandTotal() != null)
                     {
@@ -153,8 +156,9 @@ public class YakHerdInventoryExcelExporter
             Row totalRow = getOrCreateRow(sheet, rowIndex);
             clearDataCells(totalRow);
             setStringCell(totalRow, COL_SEQ, "合计");
-            mergeTotalLabelCells(sheet, rowIndex);
             totals.writeToRow(totalRow);
+            applyDataRowStyles(totalRow, dataRowStyles, dataRowHeight);
+            mergeTotalLabelCells(sheet, rowIndex);
             removeRowsAfter(sheet, rowIndex);
             workbook.write(out);
             return out.toByteArray();
@@ -273,7 +277,8 @@ public class YakHerdInventoryExcelExporter
                     continue;
                 }
                 String text = formatter.formatCellValue(cell);
-                if (StringUtils.isEmpty(text) || !text.contains("年") || text.contains("填表时间"))
+                // 跳过填表人/填表时间行，避免把占位年月改成统计年导致填表时间无法落到当月
+                if (StringUtils.isEmpty(text) || !text.contains("年") || isFillerMetaText(text))
                 {
                     continue;
                 }
@@ -292,11 +297,20 @@ public class YakHerdInventoryExcelExporter
                 {
                     updated = monthMatcher.replaceFirst("（" + statMonth + "月）");
                 }
+                else if (updated.contains("（X月）") || updated.contains("(X月)"))
+                {
+                    updated = updated.replace("（X月）", "（" + statMonth + "月）").replace("(X月)", "（" + statMonth + "月）");
+                }
                 cell.setCellValue(updated);
             }
         }
     }
 
+    private static boolean isFillerMetaText(String text)
+    {
+        return text.contains("填表人") || text.contains("填表时间");
+    }
+
     /**
      * 填写「填表人」与「填表时间」；填表时间固定为导出当日的当前年月。
      */
@@ -413,6 +427,61 @@ public class YakHerdInventoryExcelExporter
         return row;
     }
 
+    private static CellStyle[] captureDataRowStyles(Sheet sheet, int styleSourceRow)
+    {
+        CellStyle[] styles = new CellStyle[YakHerdInventoryExcelParser.COL_LAST + 1];
+        Row src = sheet.getRow(styleSourceRow);
+        if (src == null)
+        {
+            return styles;
+        }
+        for (int col = 0; col < styles.length; col++)
+        {
+            Cell cell = src.getCell(col);
+            if (cell != null)
+            {
+                styles[col] = cell.getCellStyle();
+            }
+        }
+        return styles;
+    }
+
+    private static Float captureRowHeight(Sheet sheet, int styleSourceRow)
+    {
+        Row src = sheet.getRow(styleSourceRow);
+        if (src == null)
+        {
+            return null;
+        }
+        return src.getHeightInPoints();
+    }
+
+    private static void applyDataRowStyles(Row row, CellStyle[] styles, Float rowHeight)
+    {
+        if (row == null || styles == null)
+        {
+            return;
+        }
+        if (rowHeight != null && rowHeight > 0)
+        {
+            row.setHeightInPoints(rowHeight);
+        }
+        for (int col = 0; col < styles.length; col++)
+        {
+            CellStyle style = styles[col];
+            if (style == null)
+            {
+                continue;
+            }
+            Cell cell = row.getCell(col);
+            if (cell == null)
+            {
+                cell = row.createCell(col);
+            }
+            cell.setCellStyle(style);
+        }
+    }
+
     private static void fillDataRow(Row row, BizYakHerdInventory inv)
     {
         YakHerdInventoryValidation.recalculateDerived(inv);

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

@@ -139,4 +139,94 @@ class YakHerdInventoryExcelExporterTest
             }
         }
     }
+
+    @Test
+    @DisplayName("导出标题使用所选年月，填表时间为当月")
+    void exportTitleUsesSelectedYearMonth() throws Exception
+    {
+        java.time.LocalDate today = java.time.LocalDate.now();
+        int exportMonth = today.getMonthValue() == 1 ? 12 : today.getMonthValue() - 1;
+        int exportYear = today.getMonthValue() == 1 ? today.getYear() - 1 : today.getYear();
+        if (!YakHerdInventoryYearSupport.isAllowedYear(exportYear))
+        {
+            exportYear = today.getYear();
+            exportMonth = Math.max(1, today.getMonthValue() - 1);
+        }
+
+        BizYakHerdInventory inv = new BizYakHerdInventory();
+        inv.setTownName("雅安镇");
+        inv.setVillageName("测试村");
+        inv.setVillageDeptId(201L);
+        inv.setVillageCount(1);
+        inv.setHerdsmanHouseholdCount(1);
+        inv.setBreedingBullCount(1);
+        inv.setBullCastratedCount(1);
+        inv.setCowYoungCount(1);
+        inv.setCowAdultCount(1);
+        inv.setMilkingCowCount(1);
+        inv.setFertileCowCount(1);
+        inv.setSheepTotal(1);
+        inv.setMilkingSheepCount(0);
+        inv.setInsuredYakCount(0);
+        YakHerdInventoryValidation.recalculateDerived(inv);
+
+        byte[] bytes = exporter.export(exportYear, exportMonth, Collections.singletonList(inv), "admin");
+        try (org.apache.poi.ss.usermodel.Workbook wb = org.apache.poi.ss.usermodel.WorkbookFactory.create(
+                new java.io.ByteArrayInputStream(bytes)))
+        {
+            org.apache.poi.ss.usermodel.DataFormatter fmt = new org.apache.poi.ss.usermodel.DataFormatter();
+            String title = fmt.formatCellValue(wb.getSheetAt(0).getRow(0).getCell(0));
+            String filler = fmt.formatCellValue(wb.getSheetAt(0).getRow(1).getCell(0));
+            assertTrue(title.contains(exportYear + "年"), title);
+            assertTrue(title.contains("（" + exportMonth + "月）"), title);
+            assertTrue(filler.contains("填表时间：" + today.getYear() + "年" + today.getMonthValue() + "月"), filler);
+        }
+    }
+
+    @Test
+    @DisplayName("导出合计行应保留边框（数据行多于模板样例时）")
+    void exportTotalRowKeepsBorders() throws Exception
+    {
+        java.util.List<BizYakHerdInventory> list = new java.util.ArrayList<>();
+        for (int i = 0; i < 3; i++)
+        {
+            BizYakHerdInventory inv = new BizYakHerdInventory();
+            inv.setTownName("雅安镇");
+            inv.setVillageName("村" + i);
+            inv.setVillageDeptId(200L + i);
+            inv.setVillageCount(10);
+            inv.setHerdsmanHouseholdCount(10);
+            inv.setBreedingBullCount(1);
+            inv.setBullCastratedCount(2);
+            inv.setCowYoungCount(3);
+            inv.setCowAdultCount(4);
+            inv.setMilkingCowCount(5);
+            inv.setFertileCowCount(6);
+            inv.setSheepTotal(7);
+            inv.setMilkingSheepCount(1);
+            inv.setInsuredYakCount(1);
+            YakHerdInventoryValidation.recalculateDerived(inv);
+            list.add(inv);
+        }
+
+        byte[] bytes = exporter.export(2026, 7, list, "admin");
+        try (org.apache.poi.ss.usermodel.Workbook wb = org.apache.poi.ss.usermodel.WorkbookFactory.create(
+                new java.io.ByteArrayInputStream(bytes)))
+        {
+            org.apache.poi.ss.usermodel.Sheet sheet = wb.getSheetAt(0);
+            int header = YakHerdInventoryExcelParser.detectHeaderRow(sheet);
+            int totalIdx = header + 3 + list.size();
+            org.apache.poi.ss.usermodel.Row totalRow = sheet.getRow(totalIdx);
+            assertNotNull(totalRow);
+            org.apache.poi.ss.usermodel.DataFormatter fmt = new org.apache.poi.ss.usermodel.DataFormatter();
+            assertEquals("合计", fmt.formatCellValue(totalRow.getCell(0)));
+            for (int col = 0; col <= YakHerdInventoryExcelParser.COL_LAST; col++)
+            {
+                org.apache.poi.ss.usermodel.Cell cell = totalRow.getCell(col);
+                assertNotNull(cell, "合计行列 " + col + " 应存在");
+                assertTrue(cell.getCellStyle().getBorderBottom() != org.apache.poi.ss.usermodel.BorderStyle.NONE,
+                        "合计行列 " + col + " 应有下边框");
+            }
+        }
+    }
 }