大屏首页

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/controller/BreedingIndustryDashboardController.java

@@ -22,8 +22,10 @@ public class BreedingIndustryDashboardController extends BaseController
 
     @PreAuthorize("@ss.hasPermi('dataModel:breedingIndustry:query')")
     @GetMapping("/dashboard")
-    public AjaxResult dashboard(@RequestParam(value = "forceRefresh", defaultValue = "false") boolean forceRefresh)
+    public AjaxResult dashboard(
+            @RequestParam(value = "forceRefresh", defaultValue = "false") boolean forceRefresh,
+            @RequestParam(value = "statYear", required = false) String statYear)
     {
-        return success(breedingIndustryDashboardService.loadDashboard(forceRefresh));
+        return success(breedingIndustryDashboardService.loadDashboard(forceRefresh, statYear));
     }
 }

baqing-admin/src/main/java/com/ruoyi/web/modules/industryservice/domain/vo/BreedingIndustryDashboardVo.java

@@ -2,6 +2,7 @@ package com.ruoyi.web.modules.industryservice.domain.vo;
 
 import java.util.ArrayList;
 import java.util.List;
+import com.ruoyi.web.modules.screen.domain.vo.HomeScreenYakStructureCategoryVo;
 
 public class BreedingIndustryDashboardVo
 {
@@ -13,7 +14,8 @@ public class BreedingIndustryDashboardVo
 
     private BreedingIndustryInventoryChangeVo inventoryChange = new BreedingIndustryInventoryChangeVo();
 
-    private List<BreedingIndustryAgeBandVo> ageStructure = new ArrayList<>();
+    /** 牦牛存栏结构（与大屏 yakInventoryStructure 口径一致） */
+    private List<HomeScreenYakStructureCategoryVo> yakInventoryStructure = new ArrayList<>();
 
     private BreedingIndustryGrasslandVo grassland = new BreedingIndustryGrasslandVo();
 
@@ -57,14 +59,14 @@ public class BreedingIndustryDashboardVo
         this.inventoryChange = inventoryChange;
     }
 
-    public List<BreedingIndustryAgeBandVo> getAgeStructure()
+    public List<HomeScreenYakStructureCategoryVo> getYakInventoryStructure()
     {
-        return ageStructure;
+        return yakInventoryStructure;
     }
 
-    public void setAgeStructure(List<BreedingIndustryAgeBandVo> ageStructure)
+    public void setYakInventoryStructure(List<HomeScreenYakStructureCategoryVo> yakInventoryStructure)
     {
-        this.ageStructure = ageStructure;
+        this.yakInventoryStructure = yakInventoryStructure;
     }
 
     public BreedingIndustryGrasslandVo getGrassland()

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

@@ -8,9 +8,17 @@ import com.ruoyi.web.modules.industryservice.domain.vo.BreedingIndustryDashboard
 public interface IBreedingIndustryDashboardService
 {
     /**
-     * 加载看板全量数据。
+     * 加载看板全量数据（统计年默认当前自然年）。
      *
      * @param forceRefresh 是否跳过可选缓存（本期实时聚合，参数预留）
      */
     BreedingIndustryDashboardVo loadDashboard(boolean forceRefresh);
+
+    /**
+     * 加载看板全量数据。
+     *
+     * @param forceRefresh 是否跳过可选缓存（本期实时聚合，参数预留）
+     * @param statYear     统计年份；空则当前自然年
+     */
+    BreedingIndustryDashboardVo loadDashboard(boolean forceRefresh, String statYear);
 }

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

@@ -3,7 +3,6 @@ package com.ruoyi.web.modules.industryservice.service.impl;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDate;
-import java.time.YearMonth;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -11,10 +10,11 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import com.ruoyi.web.modules.industryservice.support.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.web.modules.industryservice.domain.vo.BreedingIndustryAgeBandVo;
 import com.ruoyi.web.modules.industryservice.domain.vo.BreedingIndustryDashboardVo;
 import com.ruoyi.web.modules.industryservice.domain.vo.BreedingIndustryDegradationStatVo;
 import com.ruoyi.web.modules.industryservice.domain.vo.BreedingIndustryGrasslandVo;
@@ -22,17 +22,17 @@ import com.ruoyi.web.modules.industryservice.domain.vo.BreedingIndustryInventory
 import com.ruoyi.web.modules.industryservice.domain.vo.BreedingIndustryOverviewVo;
 import com.ruoyi.web.modules.industryservice.mapper.BreedingIndustryStatsMapper;
 import com.ruoyi.web.modules.industryservice.service.IBreedingIndustryDashboardService;
-import com.ruoyi.web.modules.industryservice.support.BreedingIndustryCalculator;
-import com.ruoyi.web.modules.industryservice.support.BreedingIndustryDashboardSupport;
-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.domain.dto.HomeScreenHerdCowAgeSumDto;
+import com.ruoyi.web.modules.prosperity.support.AchievementReportValidation;
 import com.ruoyi.web.modules.screen.domain.dto.HomeScreenHerdGenderSumDto;
 import com.ruoyi.web.modules.screen.domain.dto.HomeScreenStatPeriodDto;
+import com.ruoyi.web.modules.screen.domain.vo.HomeScreenYakStructureCategoryVo;
 import com.ruoyi.web.modules.screen.mapper.HomeScreenStatsMapper;
 import com.ruoyi.web.modules.screen.support.HomeScreenSupport;
 
+/**
+ * 养殖产业看板：产业总量（存栏/出栏/农牧户/草场面积）、存栏变动、牦牛存栏结构与大屏首页口径一致；
+ * 默认所选年为当前自然年。
+ */
 @Service
 public class BreedingIndustryDashboardServiceImpl implements IBreedingIndustryDashboardService
 {
@@ -53,84 +53,101 @@ public class BreedingIndustryDashboardServiceImpl implements IBreedingIndustryDa
 
     @Override
     public BreedingIndustryDashboardVo loadDashboard(boolean forceRefresh)
+    {
+        return loadDashboard(forceRefresh, null);
+    }
+
+    @Override
+    public BreedingIndustryDashboardVo loadDashboard(boolean forceRefresh, String statYear)
     {
         try
         {
-            LocalDate statDate = LocalDate.now(ZoneId.of(BreedingIndustryRules.ZONE_SHANGHAI));
+            int year = resolveStatYear(statYear);
+            LocalDate statDate = HomeScreenSupport.resolveStatDate(year);
             List<Long> allowedPastureIds = breedingIndustryPastureScope.resolveAllowedPastureIds();
             BreedingIndustryDashboardVo dashboard = new BreedingIndustryDashboardVo();
             dashboard.setStatDate(statDate.format(STAT_DATE_FMT));
-            dashboard.setStatYear(statDate.getYear());
+            dashboard.setStatYear(year);
+
+            HomeScreenStatPeriodDto yearHerd =
+                    homeScreenStatsMapper.selectLatestHerdInventoryStatPeriodByYear(year);
+            HomeScreenStatPeriodDto yearOutbound =
+                    homeScreenStatsMapper.selectLatestOutboundReportStatPeriodByYear(year);
+            HomeScreenStatPeriodDto yearFarmerHousehold =
+                    homeScreenStatsMapper.selectLatestFarmerHouseholdStatPeriodByYear(year);
 
             BreedingIndustryOverviewVo overview = new BreedingIndustryOverviewVo();
-            fillGrasslandOverview(overview);
-            fillOverviewFromHerdReports(overview);
+            overview.setGrasslandCount(breedingIndustryStatsMapper.countGrassland());
+            overview.setInventoryTotal(sumHerdYakAtPeriod(yearHerd));
+            overview.setAnnualOutbound(sumOutboundYakAtPeriod(yearOutbound));
+            overview.setPastureCount(sumFarmerHouseholdAtPeriod(yearFarmerHousehold));
+            overview.setGrasslandAreaMu(sumFarmerHouseholdPastureAreaAtPeriod(yearFarmerHousehold));
+            fillWarningYakCount(overview, allowedPastureIds, statDate);
             dashboard.setOverview(overview);
 
-            HomeScreenStatPeriodDto latestHerd = homeScreenStatsMapper.selectLatestHerdInventoryStatPeriod();
-            YearMonth anchor = HomeScreenSupport.currentYearMonth();
-            int startYm = HomeScreenSupport.yearMonthKey(anchor.minusMonths(11));
-            int endYm = HomeScreenSupport.yearMonthKey(anchor);
-
             BreedingIndustryInventoryChangeVo inventoryChange = new BreedingIndustryInventoryChangeVo();
-            List<BreedingIndustryAgeBandVo> ageStructure;
-            if (latestHerd == null)
+            List<HomeScreenYakStructureCategoryVo> yakInventoryStructure;
+            if (yearHerd == null)
             {
                 inventoryChange.setBullCount(0);
                 inventoryChange.setCowCount(0);
                 inventoryChange.setUnknownGenderCount(0);
-                ageStructure = BreedingIndustryDashboardSupport.toAgeStructure(
-                        HomeScreenSupport.buildCowAgeStructureFromHerdReport(null));
+                yakInventoryStructure = HomeScreenSupport.buildYakInventoryStructure(null);
             }
             else
             {
                 HomeScreenHerdGenderSumDto genderSum = homeScreenStatsMapper.sumHerdInventoryGenderByStatYearMonth(
-                        latestHerd.getStatYear(), latestHerd.getStatMonth());
-                inventoryChange.setBullCount(
-                        genderSum != null && genderSum.getBullTotal() != null ? genderSum.getBullTotal() : 0);
-                inventoryChange.setCowCount(
-                        genderSum != null && genderSum.getCowTotal() != null ? genderSum.getCowTotal() : 0);
-                inventoryChange.setUnknownGenderCount(0);
-                HomeScreenHerdCowAgeSumDto cowAge = homeScreenStatsMapper.sumHerdInventoryCowAgeByStatYearMonth(
-                        latestHerd.getStatYear(), latestHerd.getStatMonth());
-                ageStructure = BreedingIndustryDashboardSupport.toAgeStructure(
-                        HomeScreenSupport.buildCowAgeStructureFromHerdReport(cowAge));
+                        yearHerd.getStatYear(), yearHerd.getStatMonth());
+                int bull = genderSum != null && genderSum.getBullTotal() != null ? genderSum.getBullTotal() : 0;
+                int cow = genderSum != null && genderSum.getCowTotal() != null ? genderSum.getCowTotal() : 0;
+                int yakTotal = genderSum != null && genderSum.getYakTotal() != null ? genderSum.getYakTotal() : 0;
+                inventoryChange.setBullCount(bull);
+                inventoryChange.setCowCount(cow);
+                inventoryChange.setUnknownGenderCount(Math.max(0, yakTotal - bull - cow));
+                yakInventoryStructure = HomeScreenSupport.buildYakInventoryStructure(
+                        homeScreenStatsMapper.sumHerdInventoryYakStructureByStatYearMonth(
+                                yearHerd.getStatYear(), yearHerd.getStatMonth()));
             }
             inventoryChange.setMonthlyTrend(BreedingIndustryDashboardSupport.toMonthlyTrend(
-                    HomeScreenSupport.buildRolling12MonthBullCowTrend(
-                            homeScreenStatsMapper.selectHerdInventoryBullCowByYearMonthRange(startYm, endYm),
-                            anchor)));
-
-            if (allowedPastureIds.isEmpty())
-            {
-                overview.setWarningYakCount(0);
-            }
-            else
-            {
-                Date yearStart = toDate(statDate.withDayOfYear(1));
-                Date statDateEnd = toDateEndOfDay(statDate);
-                overview.setWarningYakCount(
-                        breedingIndustryStatsMapper.countWarningYak(allowedPastureIds, yearStart, statDateEnd));
-            }
+                    HomeScreenSupport.buildBullCowMonthlyTrendFromHerdReport(
+                            homeScreenStatsMapper.selectHerdInventoryBullCowByMonth(year), statDate)));
 
             dashboard.setInventoryChange(inventoryChange);
-            dashboard.setAgeStructure(ageStructure);
-            dashboard.setGrassland(buildGrasslandVo(overview.getGrasslandCount()));
+            dashboard.setYakInventoryStructure(yakInventoryStructure);
+            dashboard.setGrassland(buildGrasslandVo(overview.getGrasslandCount(), statDate));
             return dashboard;
         }
+        catch (ServiceException ex)
+        {
+            throw ex;
+        }
         catch (Exception ex)
         {
             throw new ServiceException(BreedingIndustryRules.MSG_LOAD_FAILED);
         }
     }
 
-    private void fillOverviewFromHerdReports(BreedingIndustryOverviewVo overview)
+    private static int resolveStatYear(String statYear)
     {
-        HomeScreenStatPeriodDto latestHerd = homeScreenStatsMapper.selectLatestHerdInventoryStatPeriod();
-        HomeScreenStatPeriodDto latestOutbound = homeScreenStatsMapper.selectLatestOutboundReportStatPeriod();
-        overview.setInventoryTotal(sumHerdYakAtPeriod(latestHerd));
-        overview.setAnnualOutbound(sumOutboundYakAtPeriod(latestOutbound));
-        overview.setPastureCount(sumFarmerHouseholdAtPeriod(latestOutbound));
+        if (statYear == null || statYear.trim().isEmpty())
+        {
+            return HomeScreenSupport.currentYearMonth().getYear();
+        }
+        return AchievementReportValidation.parseStatYear(statYear);
+    }
+
+    private void fillWarningYakCount(BreedingIndustryOverviewVo overview, List<Long> allowedPastureIds,
+            LocalDate statDate)
+    {
+        if (allowedPastureIds == null || allowedPastureIds.isEmpty())
+        {
+            overview.setWarningYakCount(0);
+            return;
+        }
+        Date yearStart = toDate(statDate.withDayOfYear(1));
+        Date statDateEnd = toDateEndOfDay(statDate);
+        overview.setWarningYakCount(
+                breedingIndustryStatsMapper.countWarningYak(allowedPastureIds, yearStart, statDateEnd));
     }
 
     private int sumHerdYakAtPeriod(HomeScreenStatPeriodDto period)
@@ -159,21 +176,23 @@ public class BreedingIndustryDashboardServiceImpl implements IBreedingIndustryDa
         {
             return 0;
         }
-        return homeScreenStatsMapper.sumOutboundReportFarmerHouseholdCountByStatYearMonth(
+        return homeScreenStatsMapper.sumFarmerHouseholdCountByStatYearMonth(
                 period.getStatYear(), period.getStatMonth());
     }
 
-    private void fillGrasslandOverview(BreedingIndustryOverviewVo overview)
+    private BigDecimal sumFarmerHouseholdPastureAreaAtPeriod(HomeScreenStatPeriodDto period)
     {
-        int grasslandCount = breedingIndustryStatsMapper.countGrassland();
-        overview.setGrasslandCount(grasslandCount);
-        BigDecimal area = breedingIndustryStatsMapper.sumGrasslandAreaMu();
-        overview.setGrasslandAreaMu(area != null ? area.setScale(2, RoundingMode.HALF_UP) : BigDecimal.ZERO);
+        if (period == null || period.getStatYear() == null || period.getStatMonth() == null)
+        {
+            return BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP);
+        }
+        BigDecimal area = homeScreenStatsMapper.sumFarmerHouseholdPastureContractAreaByStatYearMonth(
+                period.getStatYear(), period.getStatMonth());
+        return area != null ? area.setScale(2, RoundingMode.HALF_UP) : BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP);
     }
 
-    private BreedingIndustryGrasslandVo buildGrasslandVo(int grasslandTotal)
+    private BreedingIndustryGrasslandVo buildGrasslandVo(int grasslandTotal, LocalDate statDate)
     {
-        LocalDate statDate = LocalDate.now(ZoneId.of(BreedingIndustryRules.ZONE_SHANGHAI));
         BreedingIndustryGrasslandVo vo = new BreedingIndustryGrasslandVo();
         vo.setAvailableCount(breedingIndustryStatsMapper.countAvailableGrassland());
         vo.setInUseCount(breedingIndustryStatsMapper.countInUseGrassland(toDate(statDate)));

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

@@ -177,7 +177,6 @@ public class HomeScreenServiceImpl implements IHomeScreenService
                 homeScreenStatsMapper.selectHerdInventoryBullCowByMonth(year), statDate));
         vo.setOutboundMonthly(HomeScreenSupport.buildOutboundMonthly(
                 homeScreenStatsMapper.selectOutboundReportYakCountByMonth(year), statDate));
-        vo.setAgeStructure(Collections.emptyList());
         // 牲畜出栏 / 自食：所选年出栏表最大填报月
         if (yearOutbound == null)
         {
@@ -194,12 +193,12 @@ public class HomeScreenServiceImpl implements IHomeScreenService
                     yearOutbound,
                     homeScreenStatsMapper.sumOutboundReportSelfConsumptionByStatYearMonth(outYear, outMonth)));
         }
-        // 畜群存栏结构：所选年库中最大填报月，牦牛/奶牛/羊头数与占比
-        // 牦牛存栏结构：同月公牛/母牛/保险及细分（双层饼图）
+        // 畜群存栏结构 / 牦牛存栏结构 / 年龄结构：所选年库中最大填报月
         if (yearHerd == null)
         {
             vo.setHerdInventoryStructure(HomeScreenSupport.buildHerdInventoryStructure(null));
             vo.setYakInventoryStructure(HomeScreenSupport.buildYakInventoryStructure(null));
+            vo.setAgeStructure(HomeScreenSupport.buildCowAgeStructureFromHerdReport(null));
         }
         else
         {
@@ -209,6 +208,8 @@ public class HomeScreenServiceImpl implements IHomeScreenService
                     homeScreenStatsMapper.sumHerdInventorySpeciesByStatYearMonth(herdYear, herdMonth)));
             vo.setYakInventoryStructure(HomeScreenSupport.buildYakInventoryStructure(
                     homeScreenStatsMapper.sumHerdInventoryYakStructureByStatYearMonth(herdYear, herdMonth)));
+            vo.setAgeStructure(HomeScreenSupport.buildCowAgeStructureFromHerdReport(
+                    homeScreenStatsMapper.sumHerdInventoryCowAgeByStatYearMonth(herdYear, herdMonth)));
         }
         // 企业年度收入与补助：家庭牧场 / 养殖大户，所选年最大填报月各项合计（万元）
         if (yearFamilyRanch == null)

baqing-admin/src/test/java/com/ruoyi/web/modules/industryservice/controller/BreedingIndustryDashboardControllerApiTest.java

@@ -1,6 +1,9 @@
 package com.ruoyi.web.modules.industryservice.controller;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.Mockito.when;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
@@ -30,7 +33,6 @@ import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.framework.web.exception.GlobalExceptionHandler;
-import com.ruoyi.web.modules.industryservice.domain.vo.BreedingIndustryAgeBandVo;
 import com.ruoyi.web.modules.industryservice.domain.vo.BreedingIndustryDashboardVo;
 import com.ruoyi.web.modules.industryservice.domain.vo.BreedingIndustryDegradationStatVo;
 import com.ruoyi.web.modules.industryservice.domain.vo.BreedingIndustryGrasslandVo;
@@ -39,6 +41,8 @@ import com.ruoyi.web.modules.industryservice.domain.vo.BreedingIndustryMonthlyTr
 import com.ruoyi.web.modules.industryservice.domain.vo.BreedingIndustryOverviewVo;
 import com.ruoyi.web.modules.industryservice.service.IBreedingIndustryDashboardService;
 import com.ruoyi.web.modules.industryservice.support.BreedingIndustryRules;
+import com.ruoyi.web.modules.screen.domain.vo.HomeScreenYakStructureCategoryVo;
+import com.ruoyi.web.modules.screen.domain.vo.HomeScreenYakStructureDetailVo;
 
 @ExtendWith(MockitoExtension.class)
 @MockitoSettings(strictness = Strictness.LENIENT)
@@ -72,14 +76,14 @@ class BreedingIndustryDashboardControllerApiTest
     @DisplayName("ZCZX-YZCYSJ-API-001 GET /dashboard")
     void api001_dashboard() throws Exception
     {
-        when(breedingIndustryDashboardService.loadDashboard(false)).thenReturn(sampleDashboard());
+        when(breedingIndustryDashboardService.loadDashboard(eq(false), isNull())).thenReturn(sampleDashboard());
         mockMvc.perform(get("/dataModel/breedingIndustry/dashboard"))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.code").value(200))
                 .andExpect(jsonPath("$.data.statDate").value("2026-05-20"))
                 .andExpect(jsonPath("$.data.overview.inventoryTotal").value(120))
                 .andExpect(jsonPath("$.data.inventoryChange.bullCount").value(45))
-                .andExpect(jsonPath("$.data.ageStructure[0].bandCode").value("COW_YOUNG"))
+                .andExpect(jsonPath("$.data.yakInventoryStructure[0].categoryCode").value("BULL"))
                 .andExpect(jsonPath("$.data.grassland.availableCount").value(50));
     }
 
@@ -87,17 +91,28 @@ class BreedingIndustryDashboardControllerApiTest
     @DisplayName("ZCZX-YZCYSJ-API-010 forceRefresh")
     void api010_forceRefresh() throws Exception
     {
-        when(breedingIndustryDashboardService.loadDashboard(true)).thenReturn(sampleDashboard());
+        when(breedingIndustryDashboardService.loadDashboard(eq(true), isNull())).thenReturn(sampleDashboard());
         mockMvc.perform(get("/dataModel/breedingIndustry/dashboard").param("forceRefresh", "true"))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.code").value(200));
     }
 
+    @Test
+    @DisplayName("ZCZX-YZCYSJ-API-011 指定统计年")
+    void api011_statYear() throws Exception
+    {
+        when(breedingIndustryDashboardService.loadDashboard(eq(false), eq("2025"))).thenReturn(sampleDashboard());
+        mockMvc.perform(get("/dataModel/breedingIndustry/dashboard").param("statYear", "2025"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(200))
+                .andExpect(jsonPath("$.data.statYear").value(2026));
+    }
+
     @Test
     @DisplayName("ZCZX-YZCYSJ-API-017 聚合失败")
     void api017_loadFailed() throws Exception
     {
-        when(breedingIndustryDashboardService.loadDashboard(anyBoolean()))
+        when(breedingIndustryDashboardService.loadDashboard(anyBoolean(), any()))
                 .thenThrow(new ServiceException(BreedingIndustryRules.MSG_LOAD_FAILED));
         mockMvc.perform(get("/dataModel/breedingIndustry/dashboard"))
                 .andExpect(status().isOk())
@@ -151,12 +166,18 @@ class BreedingIndustryDashboardControllerApiTest
         point.setCowCount(55);
         inv.setMonthlyTrend(Collections.singletonList(point));
         vo.setInventoryChange(inv);
-        BreedingIndustryAgeBandVo band = new BreedingIndustryAgeBandVo();
-        band.setBandCode("COW_YOUNG");
-        band.setBandLabel("0～1.5岁幼畜");
-        band.setCount(30);
-        band.setRatio(new BigDecimal("25.0"));
-        vo.setAgeStructure(Collections.singletonList(band));
+        HomeScreenYakStructureCategoryVo cat = new HomeScreenYakStructureCategoryVo();
+        cat.setCategoryCode("BULL");
+        cat.setCategoryLabel("公牛");
+        cat.setCount(45);
+        cat.setRatio(new BigDecimal("37.5"));
+        HomeScreenYakStructureDetailVo detail = new HomeScreenYakStructureDetailVo();
+        detail.setDetailCode("BREEDING_BULL");
+        detail.setDetailLabel("种公牛");
+        detail.setCount(20);
+        detail.setRatio(new BigDecimal("16.7"));
+        cat.setDetails(Collections.singletonList(detail));
+        vo.setYakInventoryStructure(Collections.singletonList(cat));
         BreedingIndustryGrasslandVo grass = new BreedingIndustryGrasslandVo();
         grass.setAvailableCount(50);
         grass.setInUseCount(40);

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

@@ -5,7 +5,6 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;
 
 import java.math.BigDecimal;
@@ -21,11 +20,12 @@ 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.domain.dto.HomeScreenHerdCowAgeSumDto;
+import com.ruoyi.web.modules.screen.domain.dto.HomeScreenHerdGenderMonthDto;
 import com.ruoyi.web.modules.screen.domain.dto.HomeScreenHerdGenderSumDto;
+import com.ruoyi.web.modules.screen.domain.dto.HomeScreenHerdYakStructureSumDto;
 import com.ruoyi.web.modules.screen.domain.dto.HomeScreenStatPeriodDto;
-import com.ruoyi.web.modules.screen.domain.dto.HomeScreenYearMonthBullCowDto;
 import com.ruoyi.web.modules.screen.mapper.HomeScreenStatsMapper;
+import com.ruoyi.web.modules.screen.support.HomeScreenSupport;
 
 @ExtendWith(MockitoExtension.class)
 @DisplayName("BreedingIndustryDashboardServiceImpl")
@@ -44,79 +44,98 @@ class BreedingIndustryDashboardServiceImplTest
     private BreedingIndustryDashboardServiceImpl service;
 
     @Test
-    @DisplayName("ZCZX-YZCYSJ-UT-002 可见牧场为空仍返回填报趋势")
+    @DisplayName("ZCZX-YZCYSJ-UT-002 可见牧场为空仍返回填报口径")
     void ut002_emptyScope()
     {
         stubGrassland();
-        stubNoHerdReport();
+        stubNoHerdReport(2026);
         when(breedingIndustryPastureScope.resolveAllowedPastureIds()).thenReturn(Collections.emptyList());
-        BreedingIndustryDashboardVo vo = service.loadDashboard(false);
+        BreedingIndustryDashboardVo vo = service.loadDashboard(false, "2026");
+        assertEquals(2026, vo.getStatYear());
         assertEquals(0, vo.getOverview().getInventoryTotal());
         assertEquals(0, vo.getInventoryChange().getBullCount());
         assertEquals(0, vo.getInventoryChange().getCowCount());
         assertEquals(0, vo.getInventoryChange().getUnknownGenderCount());
-        assertEquals(12, vo.getInventoryChange().getMonthlyTrend().size());
-        assertEquals(2, vo.getAgeStructure().size());
+        assertEquals(0, vo.getInventoryChange().getMonthlyTrend().size());
+        assertEquals(3, vo.getYakInventoryStructure().size());
+        assertEquals(HomeScreenSupport.YAK_CAT_BULL, vo.getYakInventoryStructure().get(0).getCategoryCode());
     }
 
     @Test
-    @DisplayName("ZCZX-YZCYSJ-UT-028 产业总览与存栏取自最近填报年月")
-    void ut028_overviewFromLatestReport()
+    @DisplayName("ZCZX-YZCYSJ-UT-028 产业总览与存栏取自所选年最大填报月")
+    void ut028_overviewFromYearMaxMonth()
     {
         stubGrassland();
-        HomeScreenStatPeriodDto herd = period(2025, 12);
+        HomeScreenStatPeriodDto herd = period(2026, 7);
         HomeScreenStatPeriodDto outbound = period(2026, 5);
-        when(homeScreenStatsMapper.selectLatestHerdInventoryStatPeriod()).thenReturn(herd);
-        when(homeScreenStatsMapper.selectLatestOutboundReportStatPeriod()).thenReturn(outbound);
-        when(homeScreenStatsMapper.sumHerdInventoryYakTotalByStatYearMonth(2025, 12)).thenReturn(50000);
+        HomeScreenStatPeriodDto farmer = period(2026, 6);
+        when(homeScreenStatsMapper.selectLatestHerdInventoryStatPeriodByYear(2026)).thenReturn(herd);
+        when(homeScreenStatsMapper.selectLatestOutboundReportStatPeriodByYear(2026)).thenReturn(outbound);
+        when(homeScreenStatsMapper.selectLatestFarmerHouseholdStatPeriodByYear(2026)).thenReturn(farmer);
+        when(homeScreenStatsMapper.sumHerdInventoryYakTotalByStatYearMonth(2026, 7)).thenReturn(50000);
         when(homeScreenStatsMapper.sumOutboundReportYakCountByStatYearMonth(2026, 5)).thenReturn(3200);
-        when(homeScreenStatsMapper.sumOutboundReportFarmerHouseholdCountByStatYearMonth(2026, 5)).thenReturn(8988);
+        when(homeScreenStatsMapper.sumFarmerHouseholdCountByStatYearMonth(2026, 6)).thenReturn(8988);
+        when(homeScreenStatsMapper.sumFarmerHouseholdPastureContractAreaByStatYearMonth(2026, 6))
+                .thenReturn(new BigDecimal("12500.50"));
         stubHerdInventoryBlock(herd, 100, 200);
         when(breedingIndustryPastureScope.resolveAllowedPastureIds())
                 .thenReturn(Collections.singletonList(1L));
         when(breedingIndustryStatsMapper.countWarningYak(any(), any(), any())).thenReturn(0);
 
-        BreedingIndustryDashboardVo vo = service.loadDashboard(false);
+        BreedingIndustryDashboardVo vo = service.loadDashboard(false, "2026");
 
         assertEquals(50000, vo.getOverview().getInventoryTotal());
         assertEquals(3200, vo.getOverview().getAnnualOutbound());
         assertEquals(8988, vo.getOverview().getPastureCount());
+        assertEquals(new BigDecimal("12500.50"), vo.getOverview().getGrasslandAreaMu());
         assertEquals(100, vo.getInventoryChange().getBullCount());
         assertEquals(200, vo.getInventoryChange().getCowCount());
         assertEquals(0, vo.getInventoryChange().getUnknownGenderCount());
-        assertEquals(12, vo.getInventoryChange().getMonthlyTrend().size());
-        assertEquals(2, vo.getAgeStructure().size());
+        assertEquals(7, vo.getInventoryChange().getMonthlyTrend().size());
+        assertEquals(3, vo.getYakInventoryStructure().size());
     }
 
     @Test
-    @DisplayName("ZCZX-YZCYSJ-UT-009 公母牛取自填报无未标注")
-    void ut009_genderFromReport()
+    @DisplayName("ZCZX-YZCYSJ-UT-009 公母牛取自填报；存栏结构与大屏一致")
+    void ut009_genderAndYakStructureFromReport()
     {
         stubGrassland();
         HomeScreenStatPeriodDto herd = period(2026, 7);
-        when(homeScreenStatsMapper.selectLatestHerdInventoryStatPeriod()).thenReturn(herd);
-        when(homeScreenStatsMapper.selectLatestOutboundReportStatPeriod()).thenReturn(null);
-        when(homeScreenStatsMapper.sumHerdInventoryYakTotalByStatYearMonth(2026, 7)).thenReturn(350);
+        when(homeScreenStatsMapper.selectLatestHerdInventoryStatPeriodByYear(2026)).thenReturn(herd);
+        when(homeScreenStatsMapper.selectLatestOutboundReportStatPeriodByYear(2026)).thenReturn(null);
+        when(homeScreenStatsMapper.selectLatestFarmerHouseholdStatPeriodByYear(2026)).thenReturn(null);
+        when(homeScreenStatsMapper.sumHerdInventoryYakTotalByStatYearMonth(2026, 7)).thenReturn(360);
         HomeScreenHerdGenderSumDto gender = new HomeScreenHerdGenderSumDto();
         gender.setBullTotal(120);
         gender.setCowTotal(230);
-        gender.setYakTotal(350);
+        gender.setYakTotal(360);
         when(homeScreenStatsMapper.sumHerdInventoryGenderByStatYearMonth(2026, 7)).thenReturn(gender);
-        HomeScreenHerdCowAgeSumDto age = new HomeScreenHerdCowAgeSumDto();
-        age.setCowYoungCount(40);
-        age.setCowAdultCount(60);
-        when(homeScreenStatsMapper.sumHerdInventoryCowAgeByStatYearMonth(2026, 7)).thenReturn(age);
-        when(homeScreenStatsMapper.selectHerdInventoryBullCowByYearMonthRange(anyInt(), anyInt()))
+        HomeScreenHerdYakStructureSumDto structure = new HomeScreenHerdYakStructureSumDto();
+        structure.setBreedingBullCount(50);
+        structure.setBullCastratedCount(70);
+        structure.setCowYoungCount(80);
+        structure.setCowAdultCount(150);
+        structure.setInsuredYakCount(10);
+        when(homeScreenStatsMapper.sumHerdInventoryYakStructureByStatYearMonth(2026, 7)).thenReturn(structure);
+        when(homeScreenStatsMapper.selectHerdInventoryBullCowByMonth(2026))
                 .thenReturn(Collections.emptyList());
         when(breedingIndustryPastureScope.resolveAllowedPastureIds())
                 .thenReturn(Collections.singletonList(1L));
         when(breedingIndustryStatsMapper.countWarningYak(any(), any(), any())).thenReturn(0);
 
-        BreedingIndustryDashboardVo vo = service.loadDashboard(false);
+        BreedingIndustryDashboardVo vo = service.loadDashboard(false, "2026");
 
         assertEquals(120, vo.getInventoryChange().getBullCount());
         assertEquals(230, vo.getInventoryChange().getCowCount());
-        assertEquals(0, vo.getInventoryChange().getUnknownGenderCount());
+        assertEquals(10, vo.getInventoryChange().getUnknownGenderCount());
+        assertEquals(0, vo.getInventoryChange().getMonthlyTrend().size());
+        assertEquals(HomeScreenSupport.YAK_CAT_BULL, vo.getYakInventoryStructure().get(0).getCategoryCode());
+        assertEquals(120, vo.getYakInventoryStructure().get(0).getCount());
+        assertEquals(HomeScreenSupport.YAK_CAT_COW, vo.getYakInventoryStructure().get(1).getCategoryCode());
+        assertEquals(230, vo.getYakInventoryStructure().get(1).getCount());
+        assertEquals(10, vo.getYakInventoryStructure().get(2).getCount());
+        assertEquals("种公牛", vo.getYakInventoryStructure().get(0).getDetails().get(0).getDetailLabel());
+        assertEquals(50, vo.getYakInventoryStructure().get(0).getDetails().get(0).getCount());
     }
 
     @Test
@@ -125,7 +144,7 @@ class BreedingIndustryDashboardServiceImplTest
     {
         when(breedingIndustryPastureScope.resolveAllowedPastureIds())
                 .thenThrow(new RuntimeException("db"));
-        ServiceException ex = assertThrows(ServiceException.class, () -> service.loadDashboard(false));
+        ServiceException ex = assertThrows(ServiceException.class, () -> service.loadDashboard(false, "2026"));
         assertEquals(BreedingIndustryRules.MSG_LOAD_FAILED, ex.getMessage());
     }
 
@@ -137,11 +156,12 @@ class BreedingIndustryDashboardServiceImplTest
         return dto;
     }
 
-    private void stubNoHerdReport()
+    private void stubNoHerdReport(int year)
     {
-        when(homeScreenStatsMapper.selectLatestHerdInventoryStatPeriod()).thenReturn(null);
-        when(homeScreenStatsMapper.selectLatestOutboundReportStatPeriod()).thenReturn(null);
-        when(homeScreenStatsMapper.selectHerdInventoryBullCowByYearMonthRange(anyInt(), anyInt()))
+        when(homeScreenStatsMapper.selectLatestHerdInventoryStatPeriodByYear(year)).thenReturn(null);
+        when(homeScreenStatsMapper.selectLatestOutboundReportStatPeriodByYear(year)).thenReturn(null);
+        when(homeScreenStatsMapper.selectLatestFarmerHouseholdStatPeriodByYear(year)).thenReturn(null);
+        when(homeScreenStatsMapper.selectHerdInventoryBullCowByMonth(year))
                 .thenReturn(Collections.emptyList());
     }
 
@@ -153,22 +173,20 @@ class BreedingIndustryDashboardServiceImplTest
         gender.setYakTotal(bull + cow);
         when(homeScreenStatsMapper.sumHerdInventoryGenderByStatYearMonth(
                 eq(herd.getStatYear()), eq(herd.getStatMonth()))).thenReturn(gender);
-        HomeScreenHerdCowAgeSumDto age = new HomeScreenHerdCowAgeSumDto();
-        when(homeScreenStatsMapper.sumHerdInventoryCowAgeByStatYearMonth(
-                eq(herd.getStatYear()), eq(herd.getStatMonth()))).thenReturn(age);
-        HomeScreenYearMonthBullCowDto row = new HomeScreenYearMonthBullCowDto();
-        row.setStatYear(herd.getStatYear());
-        row.setStatMonth(herd.getStatMonth());
+        when(homeScreenStatsMapper.sumHerdInventoryYakStructureByStatYearMonth(
+                eq(herd.getStatYear()), eq(herd.getStatMonth())))
+                .thenReturn(new HomeScreenHerdYakStructureSumDto());
+        HomeScreenHerdGenderMonthDto row = new HomeScreenHerdGenderMonthDto();
+        row.setMonth(herd.getStatMonth());
         row.setBullCount(bull);
         row.setCowCount(cow);
-        when(homeScreenStatsMapper.selectHerdInventoryBullCowByYearMonthRange(anyInt(), anyInt()))
+        when(homeScreenStatsMapper.selectHerdInventoryBullCowByMonth(anyInt()))
                 .thenReturn(Collections.singletonList(row));
     }
 
     private void stubGrassland()
     {
         when(breedingIndustryStatsMapper.countGrassland()).thenReturn(3);
-        when(breedingIndustryStatsMapper.sumGrasslandAreaMu()).thenReturn(new BigDecimal("100.00"));
         when(breedingIndustryStatsMapper.countAvailableGrassland()).thenReturn(2);
         when(breedingIndustryStatsMapper.countInUseGrassland(any())).thenReturn(1);
         when(breedingIndustryStatsMapper.selectDegradationGroupCounts()).thenReturn(Collections.emptyList());

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

@@ -26,7 +26,7 @@
 
 | 方法 | HTTP | 说明 |
 | --- | --- | --- |
-| `getBreedingDashboard` | GET | `/dashboard`，Query 可选 `forceRefresh=true` |
+| `getBreedingDashboard` | GET | `/dashboard`，Query：`statYear`（默认当前年）、可选 `forceRefresh=true` |
 
 ---
 
@@ -36,10 +36,10 @@
 
 | 区块 | 组件建议 | 数据节点 |
 | --- | --- | --- |
-| 工具栏 | 右上角「刷新」`el-button`，`v-hasPermi` query | — |
+| 工具栏 | 年份 `el-select`（默认当前年）+「刷新」`el-button`，`v-hasPermi` query | `statYear` |
 | 产业总览 | 6 个 `el-card` 或指标条 | `data.overview` |
 | 牦牛存栏变动 | 公/母数字 + ECharts 折线 | `data.inventoryChange` |
-| 牦牛年龄结构 | ECharts 饼图或条形 | `data.ageStructure` |
+| 牦牛存栏结构 | ECharts 双层饼图 | `data.yakInventoryStructure` |
 | 草场类型占比 | 可用/使用中数字 + 退化占比图 | `data.grassland` |
 
 页脚或总览区展示 **统计日** `statDate`、**统计年** `statYear`（可选小字）。

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

@@ -126,11 +126,14 @@
 
 | 指标/图表 | 数据源 | 规则 |
 | --- | --- | --- |
-| 总览存栏 | `biz_yak_herd_inventory.yak_total` | 全县合计；**最近填报年月**（`stat_year`+`stat_month` 最大） |
-| 总览出栏、农牧户 | `biz_yak_outbound_report` | 同上最近填报年月；字段 `yak_outbound_count`、`farmer_household_count` |
-| 公/母牛数量 | `biz_yak_herd_inventory` | 最近填报年月全县 `bull_total`、`cow_total` |
-| 存栏趋势 | `biz_yak_herd_inventory` | 距当前 **12** 个自然月；按月全县公/母合计；缺月 **0** |
-| 年龄结构 | `biz_yak_herd_inventory` | 最近填报年月母牛两龄档合计（0～1.5 / 1.5+） |
+| 总览存栏 | `biz_yak_herd_inventory.yak_total` | 全县合计；**所选年**内最大填报月 |
+| 总览出栏 | `biz_yak_outbound_report.yak_outbound_count` | 同上；所选年最大填报月 |
+| 农牧户、草场面积 | `biz_farmer_household` | 所选年最大填报月；`household_count`、`pasture_contract_area`（与大屏一致） |
+| 公/母牛数量 | `biz_yak_herd_inventory` | 所选年最大填报月全县 `bull_total`、`cow_total`；未标注=`yak−公−母` |
+| 存栏趋势 | `biz_yak_herd_inventory` | 所选年 1～填报最大月；缺月补 **0**；无填报为空数组 |
+| 年龄结构 | `biz_yak_herd_inventory` | **改为牦牛存栏结构**（与大屏 `yakInventoryStructure` 一致）：所选年最大填报月公牛/母牛/保险及细分 |
+
+**默认年份**：进入看板时所选年为**当前自然年**（可切换）。
 
 ---
 
@@ -142,7 +145,7 @@
 | --- | --- |
 | 产业总览 | 六项指标卡片展示，见 **§5.2** |
 | 牦牛存栏变动 | 当前公、母牛数量 + 按月存栏趋势图，见 **§5.3** |
-| 牦牛年龄结构 | 母牛两档年龄占比图，见 **§5.4** |
+| 牦牛存栏结构 | 双层饼图（内环公牛·母牛·保险牛，外环细分），与大屏一致，见 **§5.4** |
 | 草场类型占比 | 可用/使用中数量 + 退化等级数量与占比，见 **§5.5** |
 | 刷新 | 重新拉取并计算全页指标，见 **§5.1** |
 
@@ -212,6 +215,7 @@ flowchart LR
 | 项 | 要求 |
 | --- | --- |
 | 布局 | 单页纵向滚动；四块标题与原型一致：产业总览、牦牛存栏变动、牦牛年龄结构、草场类型占比 |
+| 年份 | 工具栏提供年份选择；**默认当前自然年**；切换后按所选年重算总览填报项、存栏变动、年龄结构（与大屏一致） |
 | 加载 | 首次进入全页加载；失败时给出明确提示，**不得**展示上一用户缓存数据冒充成功 |
 | 刷新 | 页面提供「刷新」按钮（位置与全局规范一致，如右上角工具栏）；刷新中防重复点击；成功后更新全部指标与图表 |
 | 空数据 | 某模块无数据时，数字显示 **0** 或「—」，图表展示空态说明，不报错崩溃 |
@@ -224,12 +228,12 @@ flowchart LR
 
 | 序号 | 指标名称 | 单位 | 统计口径 |
 | --- | --- | --- | --- |
-| 1 | 牦牛存栏总量 | 头 | `biz_yak_herd_inventory.yak_total` 全县乡镇合计；**最近填报年月**；接口字段 **`inventoryTotal`** |
-| 2 | 牦牛年出栏量 | 头 | `biz_yak_outbound_report.yak_outbound_count` 全县乡镇合计；**最近填报年月**；接口字段 **`annualOutbound`** |
+| 1 | 牦牛存栏总量 | 头 | `biz_yak_herd_inventory.yak_total` 全县合计；**所选年最大填报月**；接口字段 **`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** |
+| 4 | 农牧户 | 户 | `biz_farmer_household.household_count` 全县合计；**所选年最大填报月**；接口字段 **`pastureCount`** |
+| 5 | 草场数量 | 个 | **§2.6**（台账块数） |
+| 6 | 草场面积 | 亩 | `biz_farmer_household.pasture_contract_area` 全县合计；**所选年最大填报月**；接口字段 **`grasslandAreaMu`** |
 
 **展示规则：**
 
@@ -245,30 +249,32 @@ flowchart LR
 
 | 指标 | 单位 | 口径 |
 | --- | --- | --- |
-| 公牛数量 | 头 | `biz_yak_herd_inventory.bull_total` 全县乡镇合计；取**最近填报年月**（`stat_year` + `stat_month` 最大） |
-| 母牛数量 | 头 | `biz_yak_herd_inventory.cow_total` 全县乡镇合计；同上 |
+| 公牛数量 | 头 | `biz_yak_herd_inventory.bull_total` 全县合计；取**所选年最大填报月** |
+| 母牛数量 | 头 | `biz_yak_herd_inventory.cow_total` 全县合计；同上 |
 
-**不展示**「未标注性别」；与大屏首页存栏变动 header 口径一致。
+接口另回传 `unknownGenderCount = max(0, yak−bull−cow)`（与大屏一致；页面可不展示）。
 
 #### 5.3.2 存栏趋势（折线图）
 
 | 项 | 要求 |
 | --- | --- |
 | 图表类型 | 折线图（**公牛**、**母牛**两系列） |
-| 数据范围 | 距当前时间**最近 12 个自然月**（与大屏「牦牛存栏变动」一致） |
-| 横轴 | 12 个刻度，**仅显示月份**；悬停展示 **YYYY年M月** |
+| 数据范围 | **所选年** 1～填报最大月（与大屏「牦牛存栏变动」一致）；无填报为空 |
+| 横轴 | 按月刻度，**仅显示月份**；悬停展示 **YYYY年M月** |
 | 纵轴 | 存栏数量，单位 **头** |
-| 接口字段 | `monthlyTrend[]` 含 `statYear`、`month`、`bullCount`、`cowCount`；缺月补 **0** |
+| 接口字段 | `monthlyTrend[]` 含 `statYear`、`month`、`bullCount`、`cowCount`；区间内缺月补 **0** |
 
-### 5.4 牦牛年龄结构
+### 5.4 牦牛存栏结构
 
 | 项 | 要求 |
 | --- | --- |
-| 图表类型 | 饼图（或环形图，与原型一致） |
-| 统计对象 | 存栏填报**最近年月**全县母牛分龄合计 |
-| 分档 | 两档（与大屏一致）：**0～1.5岁幼畜**、**1.5岁以上成畜** |
-| 编码 | `COW_YOUNG` / `COW_ADULT` |
-| 展示 | 每档展示**头数**与**占比（%）**；各档占比之和为 **100%**（四舍五入 ±1% 可接受） |
+| 图表类型 | 双层饼图（内环大类、外环细分；与大屏「牦牛存栏结构」一致） |
+| 统计对象 | 存栏填报**所选年最大填报月**全县合计 |
+| 内环 | 公牛 / 母牛 / 保险牛 |
+| 外环 | 种公牛、公牛/阉畜、0～1.5岁、1.5岁以上、保险 |
+| 接口字段 | `yakInventoryStructure[]`（与大屏同结构） |
+| 默认年份 | **当前自然年** |
+| 展示 | 内环/外环均展示头数与占比（%）；占比按牦牛总量（公牛+母牛+保险）计算 |
 
 ### 5.5 草场类型占比
 
@@ -380,6 +386,8 @@ flowchart LR
 
 | 版本 | 日期 | 说明 |
 | --- | --- | --- |
+| 1.5 | 2026-07-24 | 原「年龄结构」改为「牦牛存栏结构」，与大屏 `yakInventoryStructure` 双层饼口径一致；默认当前年 |
+| 1.4 | 2026-07-24 | 产业总量/存栏变动/年龄与大屏按所选年对齐；默认当前年；农牧户与草场面积改农牧户填报 |
 | 1.3 | 2026-07-17 | 年龄结构改为母牛两档（0～1.5 / 1.5+），与存栏填报、大屏对齐 |
 | 1.2 | 2026-07-04 | 存栏变动/年龄/总览三项改填报表；滚动 12 月；母牛四档；与大屏对齐 |
 | 1.1 | （既有） | 总览存栏/出栏/农牧户改填报合计 |

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

@@ -22,7 +22,7 @@
 | 看板加载/刷新 | 一次请求返回四块数据；`statDate` 取服务器当前日期 |
 | 数据权限 | Service 注入用户可见 `pastureId` 列表；牦牛、预警按 **§2.2** 过滤；草场全县台账不按牧场过滤 |
 | 月末存栏趋势（档案） | 历史能力保留于 `BreedingIndustryCalculator`；**看板趋势已改填报表**，见 **§2.11** |
-| 存栏变动/年龄/趋势 | 复用 `HomeScreenStatsMapper` + `HomeScreenSupport` 滚动 12 月逻辑，与大屏一致 |
+| 存栏变动/年龄/趋势 | 复用 `HomeScreenStatsMapper` + `HomeScreenSupport`；按**所选年**最大填报月与 1～N 月趋势，与大屏首页一致 |
 | 性能 | 数据量大时启用 **§2.3** 可选快照表 + 短 TTL 缓存；本期可先实时聚合；月末 12 点目标 **≤3s**（1 万级档案，评审可调） |
 
 **依赖模块（只读）**
@@ -34,7 +34,8 @@
 | `biz_yak_asset` | 牦牛资产档案 |
 | `biz_yak_disease_warning` | 牦牛疾病预警 |
 | `biz_yak_herd_inventory` | 牦牛存栏数据填报（存栏变动、年龄结构、总览存栏） |
-| `biz_yak_outbound_report` | 牦牛出栏数据填报（总览出栏、农牧户） |
+| `biz_yak_outbound_report` | 牦牛出栏数据填报（总览出栏） |
+| `biz_farmer_household` | 农牧户填报（总览农牧户、草场面积） |
 
 ---
 
@@ -204,37 +205,38 @@ return success(dashboardService.loadDashboard(allowed, forceRefresh));
 | 参数 | 类型 | 必填 | 说明 |
 | --- | --- | --- | --- |
 | `forceRefresh` | boolean | N | 默认 `false`；`true` 时跳过 **§2.3** 缓存 |
+| `statYear` | string | N | 四位年份；空则**当前自然年** |
 
 #### 3.1.2 响应 `data` 结构
 
 | 节点 | 类型 | 说明 |
 | --- | --- | --- |
-| `statDate` | string | 统计日 `yyyy-MM-dd` |
-| `statYear` | int | 当前自然年，如 `2026` |
+| `statDate` | string | 统计日 `yyyy-MM-dd`（所选年为当年则当日，历史年为 12-31） |
+| `statYear` | int | 回显所选年 |
 | `overview` | object | 产业总览 **§3.1.3** |
 | `inventoryChange` | object | 牦牛存栏变动 **§3.1.4** |
-| `ageStructure` | array | 年龄结构 **§3.1.5** |
+| `yakInventoryStructure` | array | 牦牛存栏结构 **§3.1.5**（与大屏一致） |
 | `grassland` | object | 草场类型占比 **§3.1.6** |
 
 #### 3.1.3 `overview`
 
 | 字段 | 类型 | 说明 |
 | --- | --- | --- |
-| `inventoryTotal` | int | 牦牛存栏总量（头）；`biz_yak_herd_inventory` **最近填报年月**全县 `yak_total` 合计 |
-| `annualOutbound` | int | 牦牛年出栏量（头）；`biz_yak_outbound_report` **最近填报年月**全县 `yak_outbound_count` 合计 |
+| `inventoryTotal` | int | 牦牛存栏总量（头）；所选年最大填报月全县 `yak_total` |
+| `annualOutbound` | int | 牦牛年出栏量（头）；所选年最大填报月全县 `yak_outbound_count` |
 | `warningYakCount` | int | 预警牦牛数量（头）；**§2.5** 档案口径 |
-| `pastureCount` | int | 农牧户（户）；`biz_yak_outbound_report` **最近填报年月**全县 `farmer_household_count` 合计 |
-| `grasslandCount` | int | 草场数量（个） |
-| `grasslandAreaMu` | decimal | 草场面积（亩） |
+| `pastureCount` | int | 农牧户（户）；所选年最大填报月 `biz_farmer_household.household_count` |
+| `grasslandCount` | int | 草场数量（个）；台账块数 |
+| `grasslandAreaMu` | decimal | 草场面积（亩）；所选年最大填报月 `pasture_contract_area` |
 
 #### 3.1.4 `inventoryChange`
 
 | 字段 | 类型 | 说明 |
 | --- | --- | --- |
-| `bullCount` | int | 公牛数量（头）；最近填报年月全县 `bull_total` 合计 |
-| `cowCount` | int | 母牛数量（头）；最近填报年月全县 `cow_total` 合计 |
-| `unknownGenderCount` | int | 固定 **0**（不展示未标注性别） |
-| `monthlyTrend` | array | 滚动最近 **12** 自然月；固定 **12** 条 |
+| `bullCount` | int | 公牛数量（头）；所选年最大填报月全县 `bull_total` |
+| `cowCount` | int | 母牛数量（头）；所选年最大填报月全县 `cow_total` |
+| `unknownGenderCount` | int | `max(0, yak−bull−cow)` |
+| `monthlyTrend` | array | 所选年 1～填报最大月；无填报为空 |
 
 `monthlyTrend[]` 元素：
 
@@ -245,16 +247,12 @@ return success(dashboardService.loadDashboard(allowed, forceRefresh));
 | `bullCount` | int | 该月全县公牛合计；无数据为 **0** |
 | `cowCount` | int | 该月全县母牛合计；无数据为 **0** |
 
-#### 3.1.5 `ageStructure[]`
+#### 3.1.5 `yakInventoryStructure[]`
 
-| 字段 | 类型 | 说明 |
-| --- | --- | --- |
-| `bandCode` | string | `COW_YOUNG` / `COW_ADULT` |
-| `bandLabel` | string | `0～1.5岁幼畜` / `1.5岁以上成畜` |
-| `count` | int | 头数 |
-| `ratio` | decimal | 占比 0～100 数值，保留 1 位小数 |
+与大屏首页 `yakInventoryStructure` 完全一致：内环三类（`BULL`/`COW`/`INSURED`），外环细分（种公牛、公牛/阉畜、0～1.5岁、1.5岁以上、保险）；所选年最大填报月全县合计；count=0 也返回三类。
 
-两档固定返回（count 为 0 也返回）；与大屏年龄结构一致；数据源为存栏填报 `cow_young_count` / `cow_adult_count`。
+大类字段：`categoryCode`、`categoryLabel`、`count`、`ratio`、`details[]`。  
+明细字段：`detailCode`、`detailLabel`、`count`、`ratio`。
 
 #### 3.1.6 `grassland`
 
@@ -271,7 +269,7 @@ return success(dashboardService.loadDashboard(allowed, forceRefresh));
 | `degradationLevel` | int | 1～5 |
 | `degradationLabel` | string | 未退化、轻度… |
 | `count` | int | 个数 |
-| `ratio` | decimal | 占比 %（同 `ageStructure`） |
+| `ratio` | decimal | 占比 % |
 
 五档固定返回；`count` 之和应等于 `overview.grasslandCount`。
 
@@ -301,8 +299,17 @@ return success(dashboardService.loadDashboard(allowed, forceRefresh));
         { "statYear": 2026, "month": 5, "bullCount": 45, "cowCount": 60 }
       ]
     },
-    "ageStructure": [
-      { "bandCode": "COW_U1", "bandLabel": "1岁以下", "count": 30, "ratio": 25.0 }
+    "yakInventoryStructure": [
+      {
+        "categoryCode": "BULL",
+        "categoryLabel": "公牛",
+        "count": 45,
+        "ratio": 37.5,
+        "details": [
+          { "detailCode": "BREEDING_BULL", "detailLabel": "种公牛", "count": 20, "ratio": 16.7 },
+          { "detailCode": "BULL_CASTRATED", "detailLabel": "公牛/阉畜", "count": 25, "ratio": 20.8 }
+        ]
+      }
     ],
     "grassland": {
       "availableCount": 50,
@@ -369,8 +376,8 @@ VALUES ('养殖产业数据', {parentId}, 10, 'breedingIndustry', 'livestockIndu
 | 功能需求 | 技术落点 |
 | --- | --- |
 | §5.2 产业总览 | `overview` + **§2.2** SQL |
-| §5.3 存栏变动 | `inventoryChange` + 填报表滚动 12 月（与大屏一致） |
-| §5.4 年龄结构 | `ageStructure` 母牛两档（填报最近年月） |
+| §5.3 存栏变动 | `inventoryChange` + 所选年 1～N 月趋势（与大屏一致） |
+| §5.4 牦牛存栏结构 | `yakInventoryStructure` 双层饼（与大屏一致；默认当前年） |
 | §5.5 草场占比 | `grassland` |
 | §5.1 刷新 | **3.1** `forceRefresh` |
 | §2.9 数据权限 | **§2.6** `BreedingIndustryPastureScope`（仅预警等档案类指标） |
@@ -382,6 +389,8 @@ VALUES ('养殖产业数据', {parentId}, 10, 'breedingIndustry', 'livestockIndu
 
 | 版本 | 日期 | 说明 |
 | --- | --- | --- |
+| 1.5 | 2026-07-24 | 看板「年龄结构」改为 `yakInventoryStructure`，与大屏牦牛存栏结构一致 |
+| 1.4 | 2026-07-24 | 产业总量/存栏变动/年龄与大屏按所选年对齐；默认当前年；农牧户与草场面积改农牧户填报 |
 | 1.3 | 2026-07-17 | 年龄结构两档 `COW_YOUNG`/`COW_ADULT` |
 | 1.2 | 2026-07-04 | 存栏变动/年龄/趋势改 `biz_yak_herd_inventory` 填报表；滚动 12 月；与大屏字段对齐 |
 | 1.1 | （既有） | 总览三项改填报合计 |

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

@@ -63,16 +63,16 @@
 | 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、§2.11 | HERD-L | `loadDashboard` | `bullCount`/`cowCount` 与 HERD-L 全县合计一致；`unknownGenderCount=0` |
-| ZCZX-YZCYSJ-UT-028 | 产业总览 | 填报三项最近年月 | 单元测试 | JUnit5 | §5.2、§2.11 | Mock 填报合计 | `loadDashboard` | `inventoryTotal`/`annualOutbound`/`pastureCount` 与 `HomeScreenStatsMapper` 最近年月合计一致 |
+| ZCZX-YZCYSJ-UT-013 | 存栏变动 | 公母来自所选年最大月 | 单元测试 | JUnit5 | §5.3.1、§2.11 | HERD-L | `loadDashboard` | `bullCount`/`cowCount` 与所选年最大月一致；`unknownGenderCount=yak−公−母` |
+| ZCZX-YZCYSJ-UT-028 | 产业总览 | 填报三项所选年最大月 | 单元测试 | JUnit5 | §5.2、§2.11 | Mock 填报合计 | `loadDashboard` | `inventoryTotal`/`annualOutbound`/`pastureCount`/`grasslandAreaMu` 与大屏所选年口径一致 |
 | ZCZX-YZCYSJ-UT-014 | 性别 | trim 后匹配 | 单元测试 | JUnit5 | 技术§4 | `gender=' 母 '` | `normalizeGender` | 计母牛（档案类，预警用） |
-| ZCZX-YZCYSJ-UT-015 | 年龄结构 | 两档编码 | 单元测试 | JUnit5 | §5.4 | Mock 母牛两龄填报 | `toAgeStructure` | `bandCode` 为 COW_YOUNG/COW_ADULT |
-| ZCZX-YZCYSJ-UT-016 | 年龄分档 | 占比与零分母 | 单元测试 | JUnit5 | §5.4 | 母牛合计 0 | `buildCowAgeStructureFromHerdReport` | 四档 count=0、ratio=0 仍返回 |
-| ZCZX-YZCYSJ-UT-017 | 年龄分档 | 占比之和 | 单元测试 | JUnit5 | §5.4 | 有母牛数据 | sum(ratio) | 99.9～100.1 |
-| ZCZX-YZCYSJ-UT-018 | 存栏趋势 | 滚动 12 月长度 | 单元测试 | JUnit5 | §5.3.2、§2.11 | 5 月环境 | `buildRolling12MonthBullCowTrend` | 固定 **12** 条；锚点含 statYear+month |
+| ZCZX-YZCYSJ-UT-015 | 存栏结构 | 三类编码 | 单元测试 | JUnit5 | §5.4 | Mock 填报结构 | `buildYakInventoryStructure` | `categoryCode` 为 BULL/COW/INSURED |
+| ZCZX-YZCYSJ-UT-016 | 存栏结构 | 占比与零分母 | 单元测试 | JUnit5 | §5.4 | 合计 0 | `buildYakInventoryStructure` | 三类 count=0、ratio=0 仍返回 |
+| ZCZX-YZCYSJ-UT-017 | 存栏结构 | 细分明细 | 单元测试 | JUnit5 | §5.4 | 有细分数据 | details | 含种公牛/阉畜/幼畜/成畜/保险 |
+| ZCZX-YZCYSJ-UT-018 | 存栏趋势 | 所选年 1～N 长度 | 单元测试 | JUnit5 | §5.3.2、§2.11 | 最大填报月=7 | `buildBullCowMonthlyTrendFromHerdReport` | 长度=**7**；含 statYear+month |
 | ZCZX-YZCYSJ-UT-019 | 存栏趋势 | 缺月补零 | 单元测试 | JUnit5 | §2.11 | 仅 HERD-M 有数 | 趋势某月 | `bullCount`/`cowCount` 无填报为 **0** |
-| ZCZX-YZCYSJ-UT-020 | 存栏趋势 | 最近月与 header 一致 | 单元测试 | JUnit5 | §5.3.1 | HERD-L | 趋势最后一点 vs header | 公/母分别相等 |
-| ZCZX-YZCYSJ-UT-021 | 存栏趋势 | 锚点当前月 | 单元测试 | JUnit5 | §2.11 | statDate=5-20 | 最后一点 month | 等于 **5**，statYear=**2026** |
+| ZCZX-YZCYSJ-UT-020 | 存栏趋势 | 最大月与 header 一致 | 单元测试 | JUnit5 | §5.3.1 | HERD-L | 趋势最后一点 vs header | 公/母分别相等 |
+| ZCZX-YZCYSJ-UT-021 | 存栏趋势 | 无填报为空 | 单元测试 | JUnit5 | §2.11 | 所选年无存栏 | 趋势 | 空数组 |
 | ZCZX-YZCYSJ-UT-022 | 存栏趋势 | 不依赖档案月末 | 单元测试 | JUnit5 | §2.11 | 档案与填报不一致 | 趋势 | 以填报表为准 |
 | ZCZX-YZCYSJ-UT-023 | 牧场 | 原口径暂保留 | 单元测试 | JUnit5 | §2.6 | P-停、注销 | `countPastureInScope` 仍调用 | 结果**不**写入 `pastureCount` |
 | ZCZX-YZCYSJ-UT-024 | 草场 | 面积空不参与求和 | 单元测试 | JUnit5 | §2.6 | 一条 `area_mu` null | `sumArea` | 不计该条 |
@@ -88,17 +88,17 @@
 
 | 用例编号 | 测试模块 | 测试项 | 测试类型 | 测试工具 | 测试目的 | 前置条件 | 测试步骤 | 预期结果 |
 | --- | --- | --- | --- | --- | --- | --- | --- | --- |
-| 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 | HERD-L | 读 `inventoryChange` | `unknownGenderCount=0`；公/母与 HERD-L 一致 |
-| ZCZX-YZCYSJ-API-005 | 存栏变动 | 滚动 12 月趋势 | 接口测试 | Postman | §5.3.2 | 统计日 5 月 | `monthlyTrend` | 长度=**12**；含 `statYear`/`month`/`bullCount`/`cowCount`；末项 2026-05 |
-| ZCZX-YZCYSJ-API-006 | 存栏变动 | 最近月与 header | 接口测试 | Postman | §5.3.1、§2.11 | HERD-L | 比 `monthlyTrend` 最后一项与 header | 公/母分别相等 |
-| ZCZX-YZCYSJ-API-007 | 年龄结构 | 固定两档 | 接口测试 | Postman | §5.4 | 已登录 | `ageStructure` | 长度=**2**；`bandCode` 为 COW_YOUNG/COW_ADULT；count=0 也返回 |
-| ZCZX-YZCYSJ-API-008 | 年龄结构 | 占比之和容忍 | 接口测试 | Postman | §5.4 | 存栏>0 | sum(ratio) | 99.9～100.1（四舍五入容忍） |
+| ZCZX-YZCYSJ-API-001 | 看板 | 首次加载全量结构 | 接口测试 | Postman/curl | §5.1 正常流程 | UA 登录；造数完整 | `GET /dataModel/breedingIndustry/dashboard` | `code=200`；`data` 含 `statDate`、`statYear`、`overview`、`inventoryChange`、`yakInventoryStructure`、`grassland` |
+| ZCZX-YZCYSJ-API-002 | 看板 | 默认当前年 | 接口测试 | Postman | §2.11 | 已登录；不传 `statYear` | `GET .../dashboard` | `statYear`=服务器当前公历年 |
+| ZCZX-YZCYSJ-API-003 | 产业总览 | 六项指标非负 | 接口测试 | Postman | §5.2 | 已知样本 | 读 `overview` 六字段 | 与 UT 手工值一致；`grasslandAreaMu`≥0 |
+| ZCZX-YZCYSJ-API-004 | 存栏变动 | 公母与未标注 | 接口测试 | Postman | §5.3.1 | HERD-L | 读 `inventoryChange` | 公/母与所选年最大月一致；`unknownGenderCount=yak−公−母` |
+| ZCZX-YZCYSJ-API-005 | 存栏变动 | 所选年 1～N 趋势 | 接口测试 | Postman | §5.3.2 | 最大填报月=5 | `monthlyTrend` | 长度=**5**；含 `statYear`/`month`/`bullCount`/`cowCount`；末项 month=5 |
+| ZCZX-YZCYSJ-API-006 | 存栏变动 | 最大月与 header | 接口测试 | Postman | §5.3.1、§2.11 | HERD-L | 比 `monthlyTrend` 最后一项与 header | 公/母分别相等 |
+| ZCZX-YZCYSJ-API-007 | 存栏结构 | 固定三类 | 接口测试 | Postman | §5.4 | 已登录 | `yakInventoryStructure` | 长度=**3**；`categoryCode` 为 BULL/COW/INSURED；含 details |
+| ZCZX-YZCYSJ-API-008 | 存栏结构 | 占比之和容忍 | 接口测试 | Postman | §5.4 | 存栏>0 | sum(大类 ratio) | 99.9～100.1（四舍五入容忍） |
 | ZCZX-YZCYSJ-API-009 | 草场占比 | 可用/使用中 | 接口测试 | Postman | §5.5.1 | 已登录 | `grassland.availableCount/inUseCount` | 与 UT-025～026 一致 |
 | ZCZX-YZCYSJ-API-010 | 草场占比 | 退化五档与合计 | 接口测试 | Postman | §5.5.2 | 已登录 | `degradationStats` | 长度=5；sum(count)=`grasslandCount` |
-| ZCZX-YZCYSJ-API-011 | 刷新 | forceRefresh | 接口测试 | Postman | §5.1 | 已登录 | `GET .../dashboard?forceRefresh=true` | `code=200`；全节点更新；`statDate` 不变（同日） |
+| ZCZX-YZCYSJ-API-011 | 刷新 | forceRefresh + 指定年 | 接口测试 | Postman | §5.1 | 已登录 | `GET .../dashboard?statYear=2025&forceRefresh=true` | `code=200`；`statYear` 回显 2025 |
 | ZCZX-YZCYSJ-API-012 | 刷新 | 同日再次加载一致性 | 接口测试 | Postman | 技术§4 一致性 | 后台数据未变 | 连续两次 `GET`（第二次 `forceRefresh=true`） | 指标一致（除非源数据变） |
 | ZCZX-YZCYSJ-API-013 | 数据权限 | UA 隔离 P2 | 接口测试 | Postman | §2.9 | P2 牦牛+W2；UA 登录 | `GET /dashboard` | 不含 P2 牦牛；`warningYakCount` 不含 W2 |
 | ZCZX-YZCYSJ-API-014 | 数据权限 | UB 仅 P2 | 接口测试 | Postman | §2.9 | UB 登录 | `GET /dashboard` | 仅 P2 牦牛；`pastureCount` 含 P2 不含 P1 |
@@ -126,7 +126,7 @@
 | ZCZX-YZCYSJ-UI-003 | 存栏变动 | 公母文案 | UI | Playwright+Chrome | §5.3.1 | 有 HERD-L | 查看存栏区文案 | 显示公牛、母牛数量；**无**「未标注性别」 |
 | ZCZX-YZCYSJ-UI-004 | 存栏变动 | 双折线 12 月 | UI | Playwright+Chrome | §5.3.2、前端§4 | 5 月环境 | 检查 ECharts 折线 | **12** 个刻度；横轴仅「N月」；悬停显「YYYY年N月」 |
 | ZCZX-YZCYSJ-UI-005 | 存栏变动 | 最近月与 header | UI | Playwright+Chrome | §5.3.1 | 有 HERD-L | 比对折线最后一点与上方公/母数 | 分别一致 |
-| ZCZX-YZCYSJ-UI-006 | 年龄结构 | 两档饼图与占比 | UI | Playwright+Chrome | §5.4 | 有数据 | 查看年龄结构图例/标签 | 含 0～1.5岁幼畜、1.5岁以上成畜；显示 % |
+| ZCZX-YZCYSJ-UI-006 | 存栏结构 | 双层饼图 | UI | Playwright+Chrome | §5.4 | 有数据 | 查看存栏结构图例/标签 | 含公牛/母牛/保险及细分；显示 % |
 | ZCZX-YZCYSJ-UI-007 | 草场占比 | 可用/使用中与退化 | UI | Playwright+Chrome | §5.5 | 有 G | 查看草场区 | 展示可用、使用中个数；退化列表/图五档；列表占比与图一致 |
 | ZCZX-YZCYSJ-UI-009 | 刷新 | 成功更新全页 | UI | Playwright+Chrome | §5.1 | 已打开页 | 点击「刷新」 | 按钮 loading/disabled；完成后四块数据更新；可选轻提示「数据已更新」 |
 | ZCZX-YZCYSJ-UI-010 | 刷新 | 防重复点击 | UI | Playwright+Chrome | §5.1、前端§4 | 已打开页 | 刷新未完成时连点 2 次 | 仅 1 次有效请求或第二次按钮不可用 |