Merge branch 'master' of http://192.168.1.25:3000/lbyzx123/huimv-baqing

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/service/impl/BreedingIndustryDashboardServiceImpl.java

@@ -27,6 +27,7 @@ import com.ruoyi.web.modules.industryservice.support.BreedingIndustryCalculator;
 import com.ruoyi.web.modules.industryservice.support.BreedingIndustryPastureScope;
 import com.ruoyi.web.modules.industryservice.support.BreedingIndustryRules;
 import com.ruoyi.web.modules.industryservice.support.GrasslandRules;
+import com.ruoyi.web.modules.screen.mapper.HomeScreenStatsMapper;
 
 @Service
 public class BreedingIndustryDashboardServiceImpl implements IBreedingIndustryDashboardService
@@ -43,6 +44,9 @@ public class BreedingIndustryDashboardServiceImpl implements IBreedingIndustryDa
     @Autowired
     private BreedingIndustryPastureScope breedingIndustryPastureScope;
 
+    @Autowired
+    private HomeScreenStatsMapper homeScreenStatsMapper;
+
     @Override
     public BreedingIndustryDashboardVo loadDashboard(boolean forceRefresh)
     {
@@ -58,14 +62,20 @@ public class BreedingIndustryDashboardServiceImpl implements IBreedingIndustryDa
             fillGrasslandOverview(overview);
             dashboard.setOverview(overview);
 
+            int currentCalendarYear = statDate.getYear();
+            // 产业总览三项：填报合计填入既有字段（与大屏首页一致）；原快照口径见下方暂保留调用
+            overview.setInventoryTotal(
+                    homeScreenStatsMapper.sumHerdInventoryYakTotalByStatYear(currentCalendarYear - 1));
+            overview.setAnnualOutbound(
+                    homeScreenStatsMapper.sumOutboundReportYakCountByStatYear(currentCalendarYear));
+            overview.setPastureCount(
+                    homeScreenStatsMapper.sumOutboundReportFarmerHouseholdCountByStatYear(currentCalendarYear));
+
             BreedingIndustryInventoryChangeVo inventoryChange = new BreedingIndustryInventoryChangeVo();
             List<BreedingIndustryAgeBandVo> ageStructure = buildEmptyAgeStructure();
             if (allowedPastureIds.isEmpty())
             {
-                overview.setInventoryTotal(0);
-                overview.setAnnualOutbound(0);
                 overview.setWarningYakCount(0);
-                overview.setPastureCount(0);
                 inventoryChange.setBullCount(0);
                 inventoryChange.setCowCount(0);
                 inventoryChange.setUnknownGenderCount(0);
@@ -75,12 +85,12 @@ public class BreedingIndustryDashboardServiceImpl implements IBreedingIndustryDa
             {
                 Date yearStart = toDate(statDate.withDayOfYear(1));
                 Date statDateEnd = toDateEndOfDay(statDate);
-                Date statDateOnly = toDate(statDate);
 
-                overview.setPastureCount(breedingIndustryStatsMapper.countPastureInScope(allowedPastureIds));
-                overview.setInventoryTotal(breedingIndustryStatsMapper.countInventory(allowedPastureIds));
-                overview.setAnnualOutbound(
-                        breedingIndustryStatsMapper.countAnnualOutbound(allowedPastureIds, yearStart, statDateEnd));
+                // 原牧场/存栏/出栏口径（暂保留调用）
+                breedingIndustryStatsMapper.countPastureInScope(allowedPastureIds);
+                int legacyInventoryTotal = breedingIndustryStatsMapper.countInventory(allowedPastureIds);
+                breedingIndustryStatsMapper.countAnnualOutbound(allowedPastureIds, yearStart, statDateEnd);
+
                 overview.setWarningYakCount(
                         breedingIndustryStatsMapper.countWarningYak(allowedPastureIds, yearStart, statDateEnd));
 
@@ -108,14 +118,13 @@ public class BreedingIndustryDashboardServiceImpl implements IBreedingIndustryDa
                         cow++;
                     }
                 }
-                int total = overview.getInventoryTotal();
                 inventoryChange.setBullCount(bull);
                 inventoryChange.setCowCount(cow);
-                inventoryChange.setUnknownGenderCount(Math.max(0, total - bull - cow));
+                inventoryChange.setUnknownGenderCount(Math.max(0, legacyInventoryTotal - bull - cow));
                 inventoryChange.setMonthlyTrend(BreedingIndustryCalculator.buildMonthlyTrend(snapshots, statDate));
 
                 Map<String, Integer> bandCounts = BreedingIndustryCalculator.countAgeBands(snapshots, statDate);
-                ageStructure = BreedingIndustryCalculator.buildAgeStructure(bandCounts, total);
+                ageStructure = BreedingIndustryCalculator.buildAgeStructure(bandCounts, legacyInventoryTotal);
             }
             dashboard.setInventoryChange(inventoryChange);
             dashboard.setAgeStructure(ageStructure);

baqing-admin/src/main/java/com/ruoyi/web/modules/screen/domain/vo/HomeScreenIndustryOverviewVo.java

@@ -6,11 +6,11 @@ import java.math.BigDecimal;
  */
 public class HomeScreenIndustryOverviewVo
 {
-    /** 截止 statDate 牦牛存栏总头数 */
+    /** 产业总览「牦牛存栏总量」（头）：上一年全县存栏填报 `yak_total` 合计；字段名沿用 `inventoryTotal` */
     private int inventoryTotal;
-    /** 当年出栏总头数 */
+    /** 产业总览「牦牛年出栏量」（头）：当年全县出栏填报 `yak_outbound_count` 合计；字段名沿用 `annualOutbound` */
     private int annualOutbound;
-    /** 有效牧场数 */
+    /** 产业总览「农牧户」展示位（户）：当年全县出栏填报 `farmer_household_count` 合计；字段名沿用 `pastureCount` */
     private int pastureCount;
     /** 草场块数 */
     private int grasslandCount;

baqing-admin/src/main/java/com/ruoyi/web/modules/screen/mapper/HomeScreenStatsMapper.java

@@ -70,4 +70,13 @@ public interface HomeScreenStatsMapper
     List<HomeScreenTownMapMarkerVo> selectTownMapMarkers(
             @Param("herdStatYear") int herdStatYear,
             @Param("outboundStatYear") int outboundStatYear);
+
+    /** 指定年份全县乡镇牦牛存栏填报合计（{@code biz_yak_herd_inventory.yak_total}） */
+    int sumHerdInventoryYakTotalByStatYear(@Param("statYear") int statYear);
+
+    /** 指定年份全县乡镇牦牛出栏填报合计（{@code biz_yak_outbound_report.yak_outbound_count}） */
+    int sumOutboundReportYakCountByStatYear(@Param("statYear") int statYear);
+
+    /** 指定年份全县乡镇农牧户户数填报合计（{@code biz_yak_outbound_report.farmer_household_count}） */
+    int sumOutboundReportFarmerHouseholdCountByStatYear(@Param("statYear") int statYear);
 }

baqing-admin/src/main/java/com/ruoyi/web/modules/screen/service/impl/HomeScreenServiceImpl.java

@@ -68,19 +68,26 @@ public class HomeScreenServiceImpl implements IHomeScreenService
         overview.setSupplierCount(homeScreenStatsMapper.countSupplierForScreen());
         overview.setDistributorCount(homeScreenStatsMapper.countDistributorForScreen());
         overview.setTradeMarketCount(homeScreenStatsMapper.countTradeMarketForScreen());
-        overview.setPastureCount(allowedPastureIds.isEmpty()
-                ? 0
-                : breedingIndustryStatsMapper.countPastureInScope(allowedPastureIds));
+        // 原有效牧场数量口径（暂保留调用，产业总览 pastureCount 已改用农牧户填报合计）
+        if (!allowedPastureIds.isEmpty())
+        {
+            breedingIndustryStatsMapper.countPastureInScope(allowedPastureIds);
+        }
         overview.setGrasslandCount(breedingIndustryStatsMapper.countGrassland());
         BigDecimal area = breedingIndustryStatsMapper.sumGrasslandAreaMu();
         overview.setGrasslandAreaMu(area != null ? area.setScale(2, RoundingMode.HALF_UP) : BigDecimal.ZERO);
 
+        // 产业总览三项：填报合计填入既有字段（字段名不变）；原快照/资产口径见下方暂保留调用
+        int currentCalendarYear = Year.now().getValue();
+        overview.setInventoryTotal(homeScreenStatsMapper.sumHerdInventoryYakTotalByStatYear(currentCalendarYear - 1));
+        overview.setAnnualOutbound(homeScreenStatsMapper.sumOutboundReportYakCountByStatYear(currentCalendarYear));
+        overview.setPastureCount(
+                homeScreenStatsMapper.sumOutboundReportFarmerHouseholdCountByStatYear(currentCalendarYear));
+
         HomeScreenInventoryChangeVo inventoryChange = new HomeScreenInventoryChangeVo();
         if (allowedPastureIds.isEmpty())
         {
             // 无有效牧场时牦牛相关区块全部置零
-            overview.setInventoryTotal(0);
-            overview.setAnnualOutbound(0);
             inventoryChange.setBullCount(0);
             inventoryChange.setCowCount(0);
             inventoryChange.setUnknownGenderCount(0);
@@ -91,14 +98,14 @@ public class HomeScreenServiceImpl implements IHomeScreenService
         }
         else
         {
-            int inventoryTotal = HomeScreenSupport.countInventoryAtDate(snapshots, statDate);
+            // 原时点存栏口径（暂保留，供存栏变动/年龄结构等区块使用）
+            int inventoryTotalAtDate = HomeScreenSupport.countInventoryAtDate(snapshots, statDate);
             int[] gender = HomeScreenSupport.countGenderAtDate(snapshots, statDate);
-            overview.setInventoryTotal(inventoryTotal);
-            overview.setAnnualOutbound(breedingIndustryStatsMapper.countAnnualOutbound(
-                    allowedPastureIds, yearStart, yearEnd));
+            // 原资产出栏口径（暂保留调用）
+            breedingIndustryStatsMapper.countAnnualOutbound(allowedPastureIds, yearStart, yearEnd);
             inventoryChange.setBullCount(gender[0]);
             inventoryChange.setCowCount(gender[1]);
-            inventoryChange.setUnknownGenderCount(Math.max(0, inventoryTotal - gender[0] - gender[1]));
+            inventoryChange.setUnknownGenderCount(Math.max(0, inventoryTotalAtDate - gender[0] - gender[1]));
             inventoryChange.setMonthlyTrend(HomeScreenSupport.buildBullCowMonthlyTrend(snapshots, statDate));
             vo.setAgeStructure(HomeScreenSupport.buildAgeStructureAtDate(snapshots, statDate));
             vo.setOutboundMonthly(HomeScreenSupport.buildOutboundMonthly(

baqing-admin/src/main/resources/mapper/screen/HomeScreenStatsMapper.xml

@@ -163,4 +163,22 @@
           and d.status = '0'
         order by d.order_num asc, d.dept_id asc
     </select>
+
+    <select id="sumHerdInventoryYakTotalByStatYear" resultType="int">
+        select coalesce(sum(yak_total), 0)
+        from biz_yak_herd_inventory
+        where stat_year = #{statYear}
+    </select>
+
+    <select id="sumOutboundReportYakCountByStatYear" resultType="int">
+        select coalesce(sum(yak_outbound_count), 0)
+        from biz_yak_outbound_report
+        where stat_year = #{statYear}
+    </select>
+
+    <select id="sumOutboundReportFarmerHouseholdCountByStatYear" resultType="int">
+        select coalesce(sum(farmer_household_count), 0)
+        from biz_yak_outbound_report
+        where stat_year = #{statYear}
+    </select>
 </mapper>

baqing-admin/src/test/java/com/ruoyi/web/modules/industryservice/service/impl/BreedingIndustryDashboardServiceImplTest.java

@@ -2,11 +2,14 @@ package com.ruoyi.web.modules.industryservice.service.impl;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;
 
 import java.math.BigDecimal;
+import java.time.Year;
 import java.util.Arrays;
 import java.util.Collections;
 import org.junit.jupiter.api.DisplayName;
@@ -21,6 +24,7 @@ import com.ruoyi.web.modules.industryservice.domain.vo.BreedingIndustryDashboard
 import com.ruoyi.web.modules.industryservice.mapper.BreedingIndustryStatsMapper;
 import com.ruoyi.web.modules.industryservice.support.BreedingIndustryPastureScope;
 import com.ruoyi.web.modules.industryservice.support.BreedingIndustryRules;
+import com.ruoyi.web.modules.screen.mapper.HomeScreenStatsMapper;
 
 @ExtendWith(MockitoExtension.class)
 @DisplayName("BreedingIndustryDashboardServiceImpl")
@@ -32,6 +36,9 @@ class BreedingIndustryDashboardServiceImplTest
     @Mock
     private BreedingIndustryPastureScope breedingIndustryPastureScope;
 
+    @Mock
+    private HomeScreenStatsMapper homeScreenStatsMapper;
+
     @InjectMocks
     private BreedingIndustryDashboardServiceImpl service;
 
@@ -39,20 +46,48 @@ class BreedingIndustryDashboardServiceImplTest
     @DisplayName("ZCZX-YZCYSJ-UT-002 可见牧场为空")
     void ut002_emptyScope()
     {
+        int currentYear = Year.now().getValue();
         stubGrassland();
+        stubReportOverviewSums(currentYear, 100, 50, 20);
         when(breedingIndustryPastureScope.resolveAllowedPastureIds()).thenReturn(Collections.emptyList());
         BreedingIndustryDashboardVo vo = service.loadDashboard(false);
-        assertEquals(0, vo.getOverview().getInventoryTotal());
-        assertEquals(0, vo.getOverview().getPastureCount());
+        assertEquals(100, vo.getOverview().getInventoryTotal());
+        assertEquals(50, vo.getOverview().getAnnualOutbound());
+        assertEquals(20, vo.getOverview().getPastureCount());
         assertEquals(3, vo.getOverview().getGrasslandCount());
         assertEquals(0, vo.getInventoryChange().getMonthlyTrend().size());
     }
 
     @Test
-    @DisplayName("ZCZX-YZCYSJ-UT-009 公母未标=总量")
+    @DisplayName("ZCZX-YZCYSJ-UT-028 产业总览三项与大屏填报口径一致")
+    void ut028_overviewFromReportTables()
+    {
+        int currentYear = Year.now().getValue();
+        stubGrassland();
+        stubReportOverviewSums(currentYear, 50000, 3200, 8988);
+        when(breedingIndustryPastureScope.resolveAllowedPastureIds())
+                .thenReturn(Collections.singletonList(BreedingIndustryTestSamples.PASTURE_P1));
+        when(breedingIndustryStatsMapper.countPastureInScope(anyList())).thenReturn(12);
+        when(breedingIndustryStatsMapper.countInventory(anyList())).thenReturn(3);
+        when(breedingIndustryStatsMapper.countAnnualOutbound(anyList(), any(), any())).thenReturn(8);
+        when(breedingIndustryStatsMapper.countWarningYak(anyList(), any(), any())).thenReturn(0);
+        when(breedingIndustryStatsMapper.selectYakSnapshotsInScope(anyList()))
+                .thenReturn(Collections.singletonList(BreedingIndustryTestSamples.normalBull()));
+
+        BreedingIndustryDashboardVo vo = service.loadDashboard(false);
+
+        assertEquals(50000, vo.getOverview().getInventoryTotal());
+        assertEquals(3200, vo.getOverview().getAnnualOutbound());
+        assertEquals(8988, vo.getOverview().getPastureCount());
+    }
+
+    @Test
+    @DisplayName("ZCZX-YZCYSJ-UT-009 公母未标=原存栏时点总量")
     void ut009_genderSum()
     {
+        int currentYear = Year.now().getValue();
         stubGrassland();
+        stubReportOverviewSums(currentYear, 0, 0, 0);
         when(breedingIndustryPastureScope.resolveAllowedPastureIds())
                 .thenReturn(Collections.singletonList(BreedingIndustryTestSamples.PASTURE_P1));
         when(breedingIndustryStatsMapper.countPastureInScope(anyList())).thenReturn(1);
@@ -64,7 +99,6 @@ class BreedingIndustryDashboardServiceImplTest
                 BreedingIndustryTestSamples.normalCow(),
                 BreedingIndustryTestSamples.unknownGender()));
         BreedingIndustryDashboardVo vo = service.loadDashboard(false);
-        assertEquals(3, vo.getOverview().getInventoryTotal());
         assertEquals(1, vo.getInventoryChange().getBullCount());
         assertEquals(1, vo.getInventoryChange().getCowCount());
         assertEquals(1, vo.getInventoryChange().getUnknownGenderCount());
@@ -88,4 +122,14 @@ class BreedingIndustryDashboardServiceImplTest
         when(breedingIndustryStatsMapper.countInUseGrassland(any())).thenReturn(1);
         when(breedingIndustryStatsMapper.selectDegradationGroupCounts()).thenReturn(Collections.emptyList());
     }
+
+    private void stubReportOverviewSums(int currentYear, int inventory, int outbound, int farmerHousehold)
+    {
+        lenient().when(homeScreenStatsMapper.sumHerdInventoryYakTotalByStatYear(eq(currentYear - 1)))
+                .thenReturn(inventory);
+        lenient().when(homeScreenStatsMapper.sumOutboundReportYakCountByStatYear(eq(currentYear)))
+                .thenReturn(outbound);
+        lenient().when(homeScreenStatsMapper.sumOutboundReportFarmerHouseholdCountByStatYear(eq(currentYear)))
+                .thenReturn(farmerHousehold);
+    }
 }

baqing-admin/src/test/java/com/ruoyi/web/modules/screen/mapper/HomeScreenStatsMapperXmlTest.java

@@ -26,6 +26,9 @@ class HomeScreenStatsMapperXmlTest
         assertTrue(xml.contains("biz_subsidy_grant_record"));
         assertTrue(xml.contains("biz_yak_herd_inventory"));
         assertTrue(xml.contains("biz_yak_outbound_report"));
+        assertTrue(xml.contains("sumHerdInventoryYakTotalByStatYear"));
+        assertTrue(xml.contains("sumOutboundReportYakCountByStatYear"));
+        assertTrue(xml.contains("sumOutboundReportFarmerHouseholdCountByStatYear"));
         assertTrue(xml.contains("status not in (2, 3)"));
     }
 }

baqing-admin/src/test/java/com/ruoyi/web/modules/screen/service/impl/HomeScreenServiceImplTest.java

@@ -5,6 +5,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;
 
 import java.math.BigDecimal;
@@ -109,6 +110,37 @@ class HomeScreenServiceImplTest
         assertEquals(50, vo.getMarkers().get(0).getYakOutboundCount().intValue());
     }
 
+    @Test
+    @DisplayName("DP-SY-UT-027 产业总览存栏出栏取自填报合计")
+    void ut027_overviewFromReportTables()
+    {
+        int currentYear = Year.now().getValue();
+        stubBreedingWithOneYak();
+        stubOtherBlocks();
+        when(homeScreenStatsMapper.sumHerdInventoryYakTotalByStatYear(eq(currentYear - 1))).thenReturn(50000);
+        when(homeScreenStatsMapper.sumOutboundReportYakCountByStatYear(eq(currentYear))).thenReturn(3200);
+
+        HomeScreenDashboardVo vo = service.loadDashboard("2024");
+
+        assertEquals(50000, vo.getIndustryOverview().getInventoryTotal());
+        assertEquals(3200, vo.getIndustryOverview().getAnnualOutbound());
+    }
+
+    @Test
+    @DisplayName("DP-SY-UT-028 产业总览农牧户取自出栏填报合计")
+    void ut028_farmerHouseholdFromReportTable()
+    {
+        int currentYear = Year.now().getValue();
+        stubBreedingWithOneYak();
+        stubOtherBlocks();
+        when(homeScreenStatsMapper.sumOutboundReportFarmerHouseholdCountByStatYear(eq(currentYear)))
+                .thenReturn(8988);
+
+        HomeScreenDashboardVo vo = service.loadDashboard("2025");
+
+        assertEquals(8988, vo.getIndustryOverview().getPastureCount());
+    }
+
     private void stubBreedingEmpty()
     {
         when(breedingIndustryStatsMapper.selectActivePastureIds()).thenReturn(Collections.singletonList(1L));
@@ -122,6 +154,11 @@ class HomeScreenServiceImplTest
         when(breedingIndustryStatsMapper.selectDegradationGroupCounts()).thenReturn(Collections.emptyList());
         when(homeScreenStatsMapper.selectOutboundCountByMonth(anyList(), any(), any()))
                 .thenReturn(Collections.emptyList());
+        int currentYear = Year.now().getValue();
+        lenient().when(homeScreenStatsMapper.sumHerdInventoryYakTotalByStatYear(eq(currentYear - 1))).thenReturn(0);
+        lenient().when(homeScreenStatsMapper.sumOutboundReportYakCountByStatYear(eq(currentYear))).thenReturn(0);
+        lenient().when(homeScreenStatsMapper.sumOutboundReportFarmerHouseholdCountByStatYear(eq(currentYear)))
+                .thenReturn(0);
     }
 
     private void stubBreedingWithOneYak()
@@ -143,6 +180,11 @@ class HomeScreenServiceImplTest
         when(breedingIndustryStatsMapper.selectDegradationGroupCounts()).thenReturn(Collections.emptyList());
         when(homeScreenStatsMapper.selectOutboundCountByMonth(anyList(), any(), any()))
                 .thenReturn(Collections.emptyList());
+        int currentYear = Year.now().getValue();
+        lenient().when(homeScreenStatsMapper.sumHerdInventoryYakTotalByStatYear(eq(currentYear - 1))).thenReturn(0);
+        lenient().when(homeScreenStatsMapper.sumOutboundReportYakCountByStatYear(eq(currentYear))).thenReturn(0);
+        lenient().when(homeScreenStatsMapper.sumOutboundReportFarmerHouseholdCountByStatYear(eq(currentYear)))
+                .thenReturn(0);
     }
 
     private void stubOtherBlocks()

doc/产业数据模型及服务/养殖产业数据/养殖产业数据功能需求.md

@@ -210,10 +210,10 @@ flowchart LR
 
 | 序号 | 指标名称 | 单位 | 统计口径 |
 | --- | --- | --- | --- |
-| 1 | 牦牛存栏总量 | 头 | **§2.3** 当前存栏头数 |
-| 2 | 牦牛年出栏量 | 头 | **§2.4** |
-| 3 | 预警牦牛数量 | 头 | **§2.5** |
-| 4 | 牧场数量 | 个 | **§2.6** |
+| 1 | 牦牛存栏总量 | 头 | `biz_yak_herd_inventory.yak_total` 全县乡镇合计；统计年 = **当前自然年 − 1**；接口字段 **`inventoryTotal`**（与大屏一致） |
+| 2 | 牦牛年出栏量 | 头 | `biz_yak_outbound_report.yak_outbound_count` 全县乡镇合计；统计年 = **当前自然年**；接口字段 **`annualOutbound`** |
+| 3 | 预警牦牛数量 | 头 | **§2.5**（仍为档案时点口径） |
+| 4 | 农牧户 | 户 | `biz_yak_outbound_report.farmer_household_count` 全县乡镇合计；统计年 = **当前自然年**；接口字段沿用 **`pastureCount`**（与大屏一致） |
 | 5 | 草场数量 | 个 | **§2.6** |
 | 6 | 草场面积 | 亩 | **§2.6** |
 
@@ -234,7 +234,7 @@ flowchart LR
 | 公牛数量 | 头 | 当前存栏中性别为「公」的头数 |
 | 母牛数量 | 头 | 当前存栏中性别为「母」的头数 |
 
-**数量关系：** 公牛数量 + 母牛数量 + 未标注性别数量 = 牦牛存栏总量（**§5.2** 第 1 项）。当未标注性别数量 > 0 时，在公、母牛数量旁展示 **「未标注性别：N 头」**（N 为整数）。
+**数量关系：** 公牛数量 + 母牛数量 + 未标注性别数量 = **§2.3** 当前存栏时点总量（原档案口径，**不等同于** **§5.2** 第 1 项填报合计）。当未标注性别数量 > 0 时，在公、母牛数量旁展示 **「未标注性别：N 头」**（N 为整数）。
 
 #### 5.3.2 存栏趋势（折线图）
 
@@ -248,7 +248,7 @@ flowchart LR
 | 当前月 | 以 **统计日** 作为时点代入 **§2.10**（代替月末日） |
 | 图例 | 「存栏数量」（或与原型一致） |
 
-**与总览联动：** 当前月折线点宜与 **§5.2**「牦牛存栏总量」一致（同一统计日、同一纳入范围）；已结束月份各点可小于或等于总览值。
+**与总览联动：** 当前月折线点与 **§2.10** 月末还原存栏一致；**§5.2** 第 1 项已改为全县填报合计，**不要求**与折线当前月点数值相同。
 
 ### 5.4 牦牛年龄结构
 

doc/产业数据模型及服务/养殖产业数据/养殖产业数据技术方案.md

@@ -218,10 +218,10 @@ return success(dashboardService.loadDashboard(allowed, forceRefresh));
 
 | 字段 | 类型 | 说明 |
 | --- | --- | --- |
-| `inventoryTotal` | int | 牦牛存栏总量（头） |
-| `annualOutbound` | int | 牦牛年出栏量（头） |
-| `warningYakCount` | int | 预警牦牛数量（头） |
-| `pastureCount` | int | 牧场数量（个） |
+| `inventoryTotal` | int | 牦牛存栏总量（头）；`biz_yak_herd_inventory` 全县合计，年份 = 当前自然年 **− 1**（与大屏 `inventoryTotal` 一致） |
+| `annualOutbound` | int | 牦牛年出栏量（头）；`biz_yak_outbound_report` 全县 `yak_outbound_count` 合计，年份 = 当前自然年 |
+| `warningYakCount` | int | 预警牦牛数量（头）；**§2.5** 档案口径 |
+| `pastureCount` | int | 农牧户（户）；`biz_yak_outbound_report` 全县 `farmer_household_count` 合计，年份 = 当前自然年（与大屏 `pastureCount` 一致） |
 | `grasslandCount` | int | 草场数量（个） |
 | `grasslandAreaMu` | decimal | 草场面积（亩） |
 
@@ -328,8 +328,9 @@ return success(dashboardService.loadDashboard(allowed, forceRefresh));
 | --- | --- |
 | **月龄** | `COALESCE(age_months, TIMESTAMPDIFF(MONTH, birth_date, statDate))`，`birth_date` 空则 0 |
 | **性别** | 入库值 `trim` 后精确匹配 `公`/`母`；第三方若写「公牛」「母牛」等，Service 层归一后再统计 |
-| **公母 vs 趋势** | `bullCount`/`cowCount`/`inventoryTotal`/`ageStructure` 用 **§2.3**（`asset_status=1`）；`monthlyTrend` 用 **§2.10** 月末判定 |
-| **一致性** | `monthlyTrend` 最后一月 `inventoryCount` 应等于 `overview.inventoryTotal`（同统计日）；实现后 UT 断言 |
+| **公母 vs 趋势** | `bullCount`/`cowCount`/`unknownGenderCount`/`ageStructure` 用 **§2.3** 原档案时点口径；`monthlyTrend` 用 **§2.10** 月末判定 |
+| **总览填报三项** | `overview.inventoryTotal` / `annualOutbound` / `pastureCount` 复用大屏 `HomeScreenStatsMapper` 填报合计 SQL；原 `countInventory` / `countAnnualOutbound` / `countPastureInScope` 在 Service 内暂保留调用 |
+| **一致性** | `monthlyTrend` 当前月点与 **§2.3** 时点存栏一致；**不要求**与 `overview.inventoryTotal`（填报合计）相同 |
 | **比率** | `ratio = count * 100.0 / NULLIF(total, 0)`，分母为 0 时 ratio=0 |
 | **月末性能** | 优先 1 条 SQL + `CASE WHEN` 按月末分组，或 Java 循环 12 次；超过 3s 启用 **§2.3** 缓存 |
 | **日志** | 看板接口可 `@Log(title="养殖产业数据", businessType=OTHER)` 或仅记录慢查询 |

doc/产业数据模型及服务/养殖产业数据/养殖产业数据测试用例.md

@@ -49,7 +49,7 @@
 | 用例编号 | 测试模块 | 测试项 | 测试类型 | 测试工具 | 测试目的 | 前置条件 | 测试步骤 | 预期结果 |
 | --- | --- | --- | --- | --- | --- | --- | --- | --- |
 | ZCZX-YZCYSJ-UT-001 | 数据权限 | 全量可见牧场 ID 列表 | 单元测试 | JUnit5 | §2.6、§2.9 | Mock ADMIN 数据范围 | 调用 `BreedingIndustryPastureScope.resolve()` | 返回全部 `biz_status=1` 且未删牧场 ID；非 null 非空 |
-| ZCZX-YZCYSJ-UT-002 | 数据权限 | 可见牧场为空列表 | 单元测试 | JUnit5 | §2.6 空 `[]` | Mock U0 | `loadDashboard([])` | 牦牛/预警/牧场数=0；草场仍统计 |
+| ZCZX-YZCYSJ-UT-002 | 数据权限 | 可见牧场为空列表 | 单元测试 | JUnit5 | §2.6 空 `[]` | Mock U0 | `loadDashboard([])` | 填报三项仍返回；预警/图表=0；草场仍统计 |
 | ZCZX-YZCYSJ-UT-003 | 数据权限 | 部分牧场 IN 过滤 | 单元测试 | JUnit5 | §2.9 | 造数 P1、P2 | `allowed=[101]` 统计牦牛 | 仅 P1 档案计入 |
 | ZCZX-YZCYSJ-UT-004 | 存栏 | 仅正常状态 | 单元测试 | JUnit5 | §2.3 | 含 status 1/2/3/4 | `countInventory` | 仅 `asset_status=1` |
 | ZCZX-YZCYSJ-UT-005 | 存栏 | 逻辑删除排除 | 单元测试 | JUnit5 | §2.3 | `del_flag=2` 档案 | 统计 | 不计入 |
@@ -60,7 +60,8 @@
 | ZCZX-YZCYSJ-UT-010 | 预警 | 周期下界 1/1 0:00 | 单元测试 | JUnit5 | §2.5 | `alert_time=当年1/1 00:00:00` | 统计 | 计入 |
 | ZCZX-YZCYSJ-UT-011 | 预警 | 周期外排除 | 单元测试 | JUnit5 | §2.5 | W-out | 统计 | 0 |
 | ZCZX-YZCYSJ-UT-012 | 预警 | 须关联纳入档案 | 单元测试 | JUnit5 | §2.9 | 预警牛仅 P2、范围 P1 | `countWarning` | 0 |
-| ZCZX-YZCYSJ-UT-013 | 性别 | 公+母+未标=总量 | 单元测试 | JUnit5 | §5.3.1 | Y-N 公母 + Y-U | 分项求和 | 等于 `inventoryTotal` |
+| ZCZX-YZCYSJ-UT-013 | 性别 | 公+母+未标=原时点总量 | 单元测试 | JUnit5 | §5.3.1 | Y-N 公母 + Y-U | 分项求和 | 等于原 `countInventory` 口径，**不等同** `overview.inventoryTotal` |
+| ZCZX-YZCYSJ-UT-028 | 产业总览 | 填报三项与大屏一致 | 单元测试 | JUnit5 | §5.2 | Mock 填报合计 | `loadDashboard` | `inventoryTotal`/`annualOutbound`/`pastureCount` 与 `HomeScreenStatsMapper` 合计一致 |
 | ZCZX-YZCYSJ-UT-014 | 性别 | trim 后匹配 | 单元测试 | JUnit5 | 技术§4 | `gender=' 母 '` | `normalizeGender` | 计母牛 |
 | ZCZX-YZCYSJ-UT-015 | 月龄 | birth_date 回退 | 单元测试 | JUnit5 | §2.3 | `age_months` 空、有生日 | `resolveAgeMonths(statDate)` | 与 `TIMESTAMPDIFF` 一致；无生日为 0 |
 | ZCZX-YZCYSJ-UT-016 | 年龄分档 | 边界 0/6/7/12/13 | 单元测试 | JUnit5 | §5.4 | 各月龄一头 | `bandOf` | M1_6、M7_12（含12）、M13_PLUS |
@@ -70,7 +71,7 @@
 | ZCZX-YZCYSJ-UT-020 | 月末趋势 | 非正常且变更日空 | 单元测试 | JUnit5 | §2.10 | status=2、date 空 | 各月 | 恒 0 |
 | ZCZX-YZCYSJ-UT-021 | 月末趋势 | 当前月用统计日 | 单元测试 | JUnit5 | §2.10、技术§4 | statDate=5-20 | 5 月点 vs `countInventory` | 相等 |
 | ZCZX-YZCYSJ-UT-022 | 月末趋势 | 不生成未来月 | 单元测试 | JUnit5 | §2.2、§5.3.2 | 5 月环境 | `buildMonthlyTrend` | 仅 month 1～5 |
-| ZCZX-YZCYSJ-UT-023 | 牧场 | 仅正常经营 | 单元测试 | JUnit5 | §2.6 | P-停、注销 | `pastureCount` | 不含停业/注销 |
+| ZCZX-YZCYSJ-UT-023 | 牧场 | 原口径暂保留 | 单元测试 | JUnit5 | §2.6 | P-停、注销 | `countPastureInScope` 仍调用 | 结果**不**写入 `pastureCount` |
 | ZCZX-YZCYSJ-UT-024 | 草场 | 面积空不参与求和 | 单元测试 | JUnit5 | §2.6 | 一条 `area_mu` null | `sumArea` | 不计该条 |
 | ZCZX-YZCYSJ-UT-025 | 草场 | 可用=未退化+轻度 | 单元测试 | JUnit5 | §2.7 | 退化 1、2、3 各 1 | `availableCount` | 2 |
 | ZCZX-YZCYSJ-UT-026 | 草场 | 禁牧闭区间 | 单元测试 | JUnit5 | §2.7 | 禁牧期内/外；统计日在期内 | `inUseCount` | 仅期外+轮牧/全年计入 |
@@ -87,7 +88,7 @@
 | ZCZX-YZCYSJ-API-001 | 看板 | 首次加载全量结构 | 接口测试 | Postman/curl | §5.1 正常流程 | UA 登录；造数完整 | `GET /dataModel/breedingIndustry/dashboard` | `code=200`；`data` 含 `statDate`、`statYear`、`overview`、`inventoryChange`、`ageStructure`、`grassland` |
 | ZCZX-YZCYSJ-API-002 | 看板 | 统计日与自然年 | 接口测试 | Postman | §2.2 | 已登录 | 同上 | `statDate`=`yyyy-MM-dd` 服务器当日；`statYear` 为公历年 |
 | ZCZX-YZCYSJ-API-003 | 产业总览 | 六项指标非负 | 接口测试 | Postman | §5.2 | 已知样本 | 读 `overview` 六字段 | 与 UT-004～012、023～024 手工值一致；`grasslandAreaMu`≥0 |
-| ZCZX-YZCYSJ-API-004 | 存栏变动 | 公母未标关系 | 接口测试 | Postman | §5.3.1 | 含 Y-U | `bullCount+cowCount+unknownGenderCount=inventoryTotal` | 成立 |
+| ZCZX-YZCYSJ-API-004 | 存栏变动 | 公母未标关系 | 接口测试 | Postman | §5.3.1 | 含 Y-U | `bullCount+cowCount+unknownGenderCount` | 等于原档案时点存栏，**不要求**等于 `overview.inventoryTotal` |
 | ZCZX-YZCYSJ-API-005 | 存栏变动 | 月趋势仅至当前月 | 接口测试 | Postman | §5.3.2 | 统计日 5 月 | `monthlyTrend` | 长度=5；`month`∈{1..5}；无 6～12 |
 | ZCZX-YZCYSJ-API-006 | 存栏变动 | 当前月=总览存栏 | 接口测试 | Postman | §5.3.2、技术§4 | 已登录 | 比 `monthlyTrend` 最后项与 `inventoryTotal` | 相等 |
 | ZCZX-YZCYSJ-API-007 | 年龄结构 | 固定三档 | 接口测试 | Postman | §5.4 | 已登录 | `ageStructure` | 长度=3；`bandCode` 为 M1_6/M7_12/M13_PLUS；count=0 也返回 |
@@ -118,7 +119,7 @@
 | 用例编号 | 测试模块 | 测试项 | 测试类型 | 测试工具 | 测试目的 | 前置条件 | 测试步骤 | 预期结果 |
 | --- | --- | --- | --- | --- | --- | --- | --- | --- |
 | ZCZX-YZCYSJ-UI-001 | 正常流程 | 菜单进入自动加载 | UI | Playwright+Chrome | §4.2、§5.1 | UA 有菜单；后端正常 | 登录→点击「养殖产业数据」 | 出现四块标题；`v-loading` 结束后六项卡片有数；无报错弹窗 |
-| ZCZX-YZCYSJ-UI-002 | 产业总览 | 六项单位与只读 | UI | Playwright+Chrome | §5.2 | 有数据 | 检查首屏卡片 | 名称含存栏/出栏/预警/牧场/草场/面积；单位头/个/亩；卡片不可点击跳转 |
+| ZCZX-YZCYSJ-UI-002 | 产业总览 | 六项单位与只读 | UI | Playwright+Chrome | §5.2 | 有数据 | 检查首屏卡片 | 名称含存栏/出栏/预警/农牧户/草场/面积；单位头/户/个/亩；卡片不可点击跳转 |
 | ZCZX-YZCYSJ-UI-003 | 存栏变动 | 公母与未标注文案 | UI | Playwright+Chrome | §5.3.1 | `unknownGenderCount>0` | 查看存栏区文案 | 显示公牛、母牛数量；显示「未标注性别：N 头」 |
 | ZCZX-YZCYSJ-UI-004 | 存栏变动 | 未标注为 0 隐藏 | UI | Playwright+Chrome | §5.3.1、前端§4 | 造数全公母 | 打开页 | 不展示「未标注性别」文案 |
 | ZCZX-YZCYSJ-UI-005 | 存栏变动 | 折线止于当前月 | UI | Playwright+Chrome | §5.3.2 | 5 月环境 | 检查 ECharts 折线 X 轴与数据点 | 1～5 月有值；6～12 月无数据点/折线不延伸 |

doc/大屏/首页/大屏首页功能需求.md

@@ -266,9 +266,9 @@ flowchart TB
 
 | 序号 | 指标名称 | 单位 | 统计口径 |
 | --- | --- | --- | --- |
-| 1 | 牦牛存栏总量 | 头 | **§2.5** 时点存栏 |
-| 2 | 牦牛年出栏量 | 头 | **§2.5** 年内出栏 |
-| 3 | 牧场数量 | 个 | **§2.5** |
+| 1 | 牦牛存栏总量 | 头 | `biz_yak_herd_inventory.yak_total` 全县乡镇合计；统计年 = **当前自然年 − 1**；接口字段沿用 **`inventoryTotal`** |
+| 2 | 牦牛年出栏量 | 头 | `biz_yak_outbound_report.yak_outbound_count` 全县乡镇合计；统计年 = **当前自然年**；接口字段沿用 **`annualOutbound`** |
+| 3 | 农牧户 | 户 | `biz_yak_outbound_report.farmer_household_count` 全县乡镇合计；统计年 = **当前自然年**；接口字段沿用 **`pastureCount`** |
 | 4 | 草场数量 | 个 | **§2.5** |
 | 5 | 草场面积 | 亩 | **§2.5** |
 | 6 | 供应商数量 | 个 | **§2.6** 实时快照 |

doc/大屏/首页/大屏首页技术方案.md

@@ -222,9 +222,10 @@
 
 | 字段 | 说明 |
 | --- | --- |
-| `inventoryTotal` | 牦牛存栏（头），时点 |
-| `annualOutbound` | 年出栏（头），**Y** 年内 |
-| `pastureCount` / `grasslandCount` / `grasslandAreaMu` | 牧场、草场、面积 |
+| `inventoryTotal` | 牦牛存栏（头），`biz_yak_herd_inventory` 全县 `yak_total` 合计；年份 = 当前自然年 **− 1**；**字段名不变** |
+| `annualOutbound` | 年出栏（头），`biz_yak_outbound_report` 全县 `yak_outbound_count` 合计；年份 = 当前自然年；**字段名不变** |
+| `pastureCount` | 农牧户（户），`biz_yak_outbound_report` 全县 `farmer_household_count` 合计；年份 = 当前自然年；**字段名不变** |
+| `grasslandCount` / `grasslandAreaMu` | 草场、面积 |
 | `supplierCount` / `distributorCount` / `tradeMarketCount` | 流通三项**实时**快照 |
 
 #### 3.1.2 `inventoryChange`
@@ -344,7 +345,8 @@
 7. agriClassroom = tech video count + training publish count by year
 8. trainingTrend = training by month; hasTrainingData
 9. availableYears = union(distinct years from各源表, current year)
-10. return AjaxResult.success(vo)
+10. industryOverview 填报合计填入既有字段：`inventoryTotal` / `annualOutbound` / `pastureCount`（农牧户）；原牧场/快照口径在 Service 内暂保留
+11. return AjaxResult.success(vo)
 ```
 
 ---

doc/大屏/首页/大屏首页测试用例.md

@@ -77,6 +77,8 @@
 | DP-SY-UT-024 | 约束 | 无标准详情接口 | 单元测试 | JUnit5 | §5.9 | 检查 Controller 映射 | 无 `GET .../standards/{id}` | 仅列表分页 |
 | DP-SY-UT-025 | 缓存 | forceRefresh | 单元测试 | JUnit5 | 技术§2.3 | 启用缓存未过期 | `loadDashboard(2026,true)` | 跳过缓存重新聚合 |
 | DP-SY-UT-026 | 地图标注 | 年份与字段 | 单元测试 | JUnit5 | §5.12 | Mock Mapper 返回 1 乡镇 | `loadTownMapMarkers()` | `herdStatYear=当前年-1`；`outboundStatYear=当前年`；含 `townDeptId`/`townName`/存栏/出栏 |
+| DP-SY-UT-027 | 产业总览 | 填报合计 | 单元测试 | JUnit5 | §5.2 | Mock 填报合计 | `loadDashboard` | `inventoryTotal`/`annualOutbound` 取自填报表；与 **Y** 无关 |
+| DP-SY-UT-028 | 产业总览 | 农牧户合计 | 单元测试 | JUnit5 | §5.2 | Mock 出栏填报农牧户户数 | `loadDashboard` | `pastureCount` 为当年全县农牧户合计（字段名不变） |
 
 ---