牦牛资产档案

baqing-admin/src/main/java/com/ruoyi/web/modules/screen/domain/dto/HomeScreenAppointmentStatDto.java

@@ -5,12 +5,36 @@ package com.ruoyi.web.modules.screen.domain.dto;
  */
 public class HomeScreenAppointmentStatDto
 {
+    private Integer statYear;
+
+    private Integer statMonth;
+
     private Integer month;
 
     private Integer providerType;
 
     private Integer count;
 
+    public Integer getStatYear()
+    {
+        return statYear;
+    }
+
+    public void setStatYear(Integer statYear)
+    {
+        this.statYear = statYear;
+    }
+
+    public Integer getStatMonth()
+    {
+        return statMonth;
+    }
+
+    public void setStatMonth(Integer statMonth)
+    {
+        this.statMonth = statMonth;
+    }
+
     public Integer getMonth()
     {
         return month;

baqing-admin/src/main/java/com/ruoyi/web/modules/screen/domain/dto/HomeScreenTrainingMonthDto.java

@@ -5,12 +5,36 @@ package com.ruoyi.web.modules.screen.domain.dto;
  */
 public class HomeScreenTrainingMonthDto
 {
+    private Integer statYear;
+
+    private Integer statMonth;
+
     private Integer month;
 
     private Integer activityCount;
 
     private Integer enrolledCount;
 
+    public Integer getStatYear()
+    {
+        return statYear;
+    }
+
+    public void setStatYear(Integer statYear)
+    {
+        this.statYear = statYear;
+    }
+
+    public Integer getStatMonth()
+    {
+        return statMonth;
+    }
+
+    public void setStatMonth(Integer statMonth)
+    {
+        this.statMonth = statMonth;
+    }
+
     public Integer getMonth()
     {
         return month;

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

@@ -4,7 +4,10 @@ package com.ruoyi.web.modules.screen.domain.vo;
  */
 public class HomeScreenAppointmentMonthVo
 {
-    /** 月份 1～12 */
+    /** 所属年份（自然年） */
+    private int statYear;
+
+    /** 所属月份 1～12 */
     private int month;
     /** 兽医预约次数 */
     private int vetCount;
@@ -13,6 +16,16 @@ public class HomeScreenAppointmentMonthVo
     /** 机构预约次数 */
     private int orgCount;
 
+    public int getStatYear()
+    {
+        return statYear;
+    }
+
+    public void setStatYear(int statYear)
+    {
+        this.statYear = statYear;
+    }
+
     public int getMonth()
     {
         return month;

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

@@ -4,13 +4,26 @@ package com.ruoyi.web.modules.screen.domain.vo;
  */
 public class HomeScreenTrainingMonthVo
 {
-    /** 月份 1～12 */
+    /** 所属年份（自然年） */
+    private int statYear;
+
+    /** 所属月份 1～12 */
     private int month;
     /** 培训活动场次 */
     private int activityCount;
     /** 报名人次 */
     private int enrolledCount;
 
+    public int getStatYear()
+    {
+        return statYear;
+    }
+
+    public void setStatYear(int statYear)
+    {
+        this.statYear = statYear;
+    }
+
     public int getMonth()
     {
         return month;

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

@@ -42,6 +42,10 @@ public interface HomeScreenStatsMapper
     /** 当年预约按月+provider_type 分组 */
     List<HomeScreenAppointmentStatDto> selectAppointmentMonthlyByYear(@Param("statYear") int statYear);
 
+    /** 自然年月区间内预约按月+provider_type 分组（{@code startYm}/{@code endYm} 为 yyyyMM） */
+    List<HomeScreenAppointmentStatDto> selectAppointmentMonthlyByYearMonthRange(
+            @Param("startYm") int startYm, @Param("endYm") int endYm);
+
     /** 惠农补贴按类型汇总金额（元） */
     List<HomeScreenSubsidyTypeSumDto> sumSubsidyAmountByTypeForYear(
             @Param("yearStart") Date yearStart,
@@ -57,8 +61,16 @@ public interface HomeScreenStatsMapper
     /** 培训趋势：按培训举办时间所在月统计 */
     List<HomeScreenTrainingMonthDto> selectTrainingTrendByTrainingYear(@Param("statYear") int statYear);
 
+    /** 自然年月区间内培训按月统计（{@code startYm}/{@code endYm} 为 yyyyMM） */
+    List<HomeScreenTrainingMonthDto> selectTrainingTrendByTrainingYearMonthRange(
+            @Param("startYm") int startYm, @Param("endYm") int endYm);
+
     int countPublishedTrainingsWithTrainingTimeInYear(@Param("statYear") int statYear);
 
+    /** 自然年月区间内已发布且 training_time 落在区间内的培训条数 */
+    int countPublishedTrainingsWithTrainingTimeInYearMonthRange(
+            @Param("startYm") int startYm, @Param("endYm") int endYm);
+
     List<Integer> selectDistinctOutboundYears();
 
     List<Integer> selectDistinctAppointmentYears();

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

@@ -114,22 +114,22 @@ public class HomeScreenServiceImpl implements IHomeScreenService
                 breedingIndustryStatsMapper.countAvailableGrassland(),
                 breedingIndustryStatsMapper.countInUseGrassland(toDate(statDate)),
                 breedingIndustryStatsMapper.selectDegradationGroupCounts()));
-        // 预约（兽医/专家/机构）、惠农补贴、农技课堂、培训趋势
         vo.setAppointment(HomeScreenSupport.buildAppointment(
                 homeScreenStatsMapper.selectAppointmentAnnualByYear(year),
-                homeScreenStatsMapper.selectAppointmentMonthlyByYear(year),
-                statDate));
+                homeScreenStatsMapper.selectAppointmentMonthlyByYearMonthRange(startYm, endYm),
+                anchor));
         vo.setSubsidy(HomeScreenSupport.buildSubsidy(
                 homeScreenStatsMapper.sumSubsidyAmountByTypeForYear(yearStart, yearEnd),
                 homeScreenStatsMapper.countSubsidyGrantInYear(yearStart, yearEnd) > 0));
         int videoCount = homeScreenStatsMapper.countVideoCoursesPublishedInYear(yearStart, yearEnd);
         int trainingPublishCount = homeScreenStatsMapper.countTrainingsPublishedInYear(yearStart, yearEnd);
         vo.setAgriClassroom(HomeScreenSupport.buildAgriClassroom(videoCount, trainingPublishCount));
-        boolean hasTraining = homeScreenStatsMapper.countPublishedTrainingsWithTrainingTimeInYear(year) > 0;
+        boolean hasTraining = homeScreenStatsMapper.countPublishedTrainingsWithTrainingTimeInYearMonthRange(
+                startYm, endYm) > 0;
         vo.setTrainingTrend(HomeScreenSupport.buildTrainingTrend(
-                homeScreenStatsMapper.selectTrainingTrendByTrainingYear(year),
+                homeScreenStatsMapper.selectTrainingTrendByTrainingYearMonthRange(startYm, endYm),
                 hasTraining,
-                statDate));
+                anchor));
         vo.setAvailableYears(HomeScreenSupport.buildAvailableYears(
                 homeScreenStatsMapper.selectDistinctOutboundYears(),
                 homeScreenStatsMapper.selectDistinctAppointmentYears(),

baqing-admin/src/main/java/com/ruoyi/web/modules/screen/support/HomeScreenSupport.java

@@ -284,6 +284,75 @@ public final class HomeScreenSupport
         return list;
     }
 
+    /**
+     * 线下服务预约：最近 12 个月堆叠柱（按时间升序，含 {@code statYear}、{@code month}）。
+     */
+    public static List<HomeScreenAppointmentMonthVo> buildRolling12MonthAppointmentStacked(
+            List<HomeScreenAppointmentStatDto> rows, YearMonth anchor)
+    {
+        Map<Integer, Map<Integer, Integer>> byYmAndType = new HashMap<>();
+        if (rows != null)
+        {
+            for (HomeScreenAppointmentStatDto row : rows)
+            {
+                if (row.getStatYear() != null && row.getStatMonth() != null && row.getProviderType() != null)
+                {
+                    int key = yearMonthKey(YearMonth.of(row.getStatYear(), row.getStatMonth()));
+                    byYmAndType.computeIfAbsent(key, k -> new HashMap<>())
+                            .put(row.getProviderType(), row.getCount() != null ? row.getCount() : 0);
+                }
+            }
+        }
+        List<HomeScreenAppointmentMonthVo> stacked = new ArrayList<>();
+        YearMonth start = anchor.minusMonths(11);
+        for (int slot = 0; slot < 12; slot++)
+        {
+            YearMonth ym = start.plusMonths(slot);
+            Map<Integer, Integer> types = byYmAndType.getOrDefault(yearMonthKey(ym), Collections.emptyMap());
+            HomeScreenAppointmentMonthVo point = new HomeScreenAppointmentMonthVo();
+            point.setStatYear(ym.getYear());
+            point.setMonth(ym.getMonthValue());
+            point.setVetCount(types.getOrDefault(PROVIDER_VET, 0));
+            point.setExpertCount(types.getOrDefault(PROVIDER_EXPERT, 0));
+            point.setOrgCount(types.getOrDefault(PROVIDER_ORG, 0));
+            stacked.add(point);
+        }
+        return stacked;
+    }
+
+    /**
+     * 实战培训报名：最近 12 个月活动数/报名人数（按时间升序，含 {@code statYear}、{@code month}）。
+     */
+    public static List<HomeScreenTrainingMonthVo> buildRolling12MonthTraining(
+            List<HomeScreenTrainingMonthDto> rows, YearMonth anchor)
+    {
+        Map<Integer, HomeScreenTrainingMonthDto> byYm = new HashMap<>();
+        if (rows != null)
+        {
+            for (HomeScreenTrainingMonthDto row : rows)
+            {
+                if (row.getStatYear() != null && row.getStatMonth() != null)
+                {
+                    byYm.put(yearMonthKey(YearMonth.of(row.getStatYear(), row.getStatMonth())), row);
+                }
+            }
+        }
+        List<HomeScreenTrainingMonthVo> monthly = new ArrayList<>();
+        YearMonth start = anchor.minusMonths(11);
+        for (int slot = 0; slot < 12; slot++)
+        {
+            YearMonth ym = start.plusMonths(slot);
+            HomeScreenTrainingMonthDto src = byYm.get(yearMonthKey(ym));
+            HomeScreenTrainingMonthVo point = new HomeScreenTrainingMonthVo();
+            point.setStatYear(ym.getYear());
+            point.setMonth(ym.getMonthValue());
+            point.setActivityCount(src != null && src.getActivityCount() != null ? src.getActivityCount() : 0);
+            point.setEnrolledCount(src != null && src.getEnrolledCount() != null ? src.getEnrolledCount() : 0);
+            monthly.add(point);
+        }
+        return monthly;
+    }
+
     /**
      * 公母牛月度存栏趋势（存栏填报表 {@code bull_total}/{@code cow_total} 全县按月合计）；当前年未来月份填 0。
      */
@@ -457,8 +526,8 @@ public final class HomeScreenSupport
 
     public static HomeScreenAppointmentVo buildAppointment(
             List<HomeScreenAppointmentStatDto> annualRows,
-            List<HomeScreenAppointmentStatDto> monthlyRows,
-            LocalDate statDate)
+            List<HomeScreenAppointmentStatDto> rollingMonthlyRows,
+            YearMonth anchor)
     {
         int vet = 0;
         int expert = 0;
@@ -485,45 +554,11 @@ public final class HomeScreenSupport
                 }
             }
         }
-        Map<String, Integer> monthlyMap = new HashMap<>();
-        if (monthlyRows != null)
-        {
-            for (HomeScreenAppointmentStatDto row : monthlyRows)
-            {
-                if (row.getMonth() == null || row.getProviderType() == null || row.getCount() == null)
-                {
-                    continue;
-                }
-                monthlyMap.put(row.getMonth() + ":" + row.getProviderType(), row.getCount());
-            }
-        }
-        int futureAfter = statDate.getMonthValue();
-        boolean currentYear = statDate.getYear()
-                == LocalDate.now(ZoneId.of(BreedingIndustryRules.ZONE_SHANGHAI)).getYear();
-        List<HomeScreenAppointmentMonthVo> stacked = new ArrayList<>();
-        for (int month = 1; month <= 12; month++)
-        {
-            HomeScreenAppointmentMonthVo point = new HomeScreenAppointmentMonthVo();
-            point.setMonth(month);
-            if (currentYear && month > futureAfter)
-            {
-                point.setVetCount(0);
-                point.setExpertCount(0);
-                point.setOrgCount(0);
-            }
-            else
-            {
-                point.setVetCount(monthlyMap.getOrDefault(month + ":" + PROVIDER_VET, 0));
-                point.setExpertCount(monthlyMap.getOrDefault(month + ":" + PROVIDER_EXPERT, 0));
-                point.setOrgCount(monthlyMap.getOrDefault(month + ":" + PROVIDER_ORG, 0));
-            }
-            stacked.add(point);
-        }
         HomeScreenAppointmentVo vo = new HomeScreenAppointmentVo();
         vo.setAnnualVetCount(vet);
         vo.setAnnualExpertCount(expert);
         vo.setAnnualOrgCount(org);
-        vo.setMonthlyStacked(stacked);
+        vo.setMonthlyStacked(buildRolling12MonthAppointmentStacked(rollingMonthlyRows, anchor));
         return vo;
     }
 
@@ -571,44 +606,16 @@ public final class HomeScreenSupport
     }
 
     public static HomeScreenTrainingTrendVo buildTrainingTrend(
-            List<HomeScreenTrainingMonthDto> rows, boolean hasTrainingData, LocalDate statDate)
+            List<HomeScreenTrainingMonthDto> rollingRows, boolean hasTrainingData, YearMonth anchor)
     {
-        Map<Integer, HomeScreenTrainingMonthDto> byMonth = new HashMap<>();
-        if (rows != null)
+        List<HomeScreenTrainingMonthVo> monthly = buildRolling12MonthTraining(rollingRows, anchor);
+        if (!hasTrainingData)
         {
-            for (HomeScreenTrainingMonthDto row : rows)
-            {
-                if (row.getMonth() != null)
-                {
-                    byMonth.put(row.getMonth(), row);
-                }
-            }
-        }
-        int futureAfter = statDate.getMonthValue();
-        boolean currentYear = statDate.getYear()
-                == LocalDate.now(ZoneId.of(BreedingIndustryRules.ZONE_SHANGHAI)).getYear();
-        List<HomeScreenTrainingMonthVo> monthly = new ArrayList<>();
-        for (int month = 1; month <= 12; month++)
-        {
-            HomeScreenTrainingMonthVo point = new HomeScreenTrainingMonthVo();
-            point.setMonth(month);
-            if (!hasTrainingData)
+            for (HomeScreenTrainingMonthVo point : monthly)
             {
                 point.setActivityCount(0);
                 point.setEnrolledCount(0);
             }
-            else if (currentYear && month > futureAfter)
-            {
-                point.setActivityCount(0);
-                point.setEnrolledCount(0);
-            }
-            else
-            {
-                HomeScreenTrainingMonthDto src = byMonth.get(month);
-                point.setActivityCount(src != null && src.getActivityCount() != null ? src.getActivityCount() : 0);
-                point.setEnrolledCount(src != null && src.getEnrolledCount() != null ? src.getEnrolledCount() : 0);
-            }
-            monthly.add(point);
         }
         HomeScreenTrainingTrendVo vo = new HomeScreenTrainingTrendVo();
         vo.setHasTrainingData(hasTrainingData);

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

@@ -54,6 +54,19 @@
         group by month(appoint_date), provider_type
     </select>
 
+    <select id="selectAppointmentMonthlyByYearMonthRange"
+            resultType="com.ruoyi.web.modules.screen.domain.dto.HomeScreenAppointmentStatDto">
+        select year(appoint_date) as statYear,
+               month(appoint_date) as statMonth,
+               provider_type as providerType,
+               count(*) as count
+        from biz_service_appointment
+        where year(appoint_date) * 100 + month(appoint_date) &gt;= #{startYm}
+          and year(appoint_date) * 100 + month(appoint_date) &lt;= #{endYm}
+          and status not in (2, 3)
+        group by year(appoint_date), month(appoint_date), provider_type
+    </select>
+
     <select id="sumSubsidyAmountByTypeForYear"
             resultType="com.ruoyi.web.modules.screen.domain.dto.HomeScreenSubsidyTypeSumDto">
         select subsidy_type as subsidyType, coalesce(sum(subsidy_amount), 0) as amountSum
@@ -94,6 +107,26 @@
         group by month(training_time)
     </select>
 
+    <select id="selectTrainingTrendByTrainingYearMonthRange"
+            resultType="com.ruoyi.web.modules.screen.domain.dto.HomeScreenTrainingMonthDto">
+        select year(training_time) as statYear,
+               month(training_time) as statMonth,
+               count(*) as activityCount,
+               coalesce(sum(actual_enrolled_count), 0) as enrolledCount
+        from biz_practical_training
+        where del_flag = '0' and publish_status = 1
+          and year(training_time) * 100 + month(training_time) &gt;= #{startYm}
+          and year(training_time) * 100 + month(training_time) &lt;= #{endYm}
+        group by year(training_time), month(training_time)
+    </select>
+
+    <select id="countPublishedTrainingsWithTrainingTimeInYearMonthRange" resultType="int">
+        select count(*) from biz_practical_training
+        where del_flag = '0' and publish_status = 1
+          and year(training_time) * 100 + month(training_time) &gt;= #{startYm}
+          and year(training_time) * 100 + month(training_time) &lt;= #{endYm}
+    </select>
+
     <select id="countPublishedTrainingsWithTrainingTimeInYear" resultType="int">
         select count(*) from biz_practical_training
         where del_flag = '0' and publish_status = 1

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

@@ -197,16 +197,17 @@ class HomeScreenServiceImplTest
         when(homeScreenStatsMapper.countTradeMarketForScreen()).thenReturn(0);
         when(homeScreenStatsMapper.selectAppointmentAnnualByYear(any(Integer.class)))
                 .thenReturn(Collections.emptyList());
-        when(homeScreenStatsMapper.selectAppointmentMonthlyByYear(any(Integer.class)))
+        when(homeScreenStatsMapper.selectAppointmentMonthlyByYearMonthRange(any(Integer.class), any(Integer.class)))
                 .thenReturn(Collections.emptyList());
         when(homeScreenStatsMapper.sumSubsidyAmountByTypeForYear(any(), any()))
                 .thenReturn(Collections.emptyList());
         when(homeScreenStatsMapper.countSubsidyGrantInYear(any(), any())).thenReturn(0);
         when(homeScreenStatsMapper.countVideoCoursesPublishedInYear(any(), any())).thenReturn(0);
         when(homeScreenStatsMapper.countTrainingsPublishedInYear(any(), any())).thenReturn(0);
-        when(homeScreenStatsMapper.countPublishedTrainingsWithTrainingTimeInYear(any(Integer.class))).thenReturn(0);
-        when(homeScreenStatsMapper.selectTrainingTrendByTrainingYear(any(Integer.class)))
-                .thenReturn(Collections.emptyList());
+        when(homeScreenStatsMapper.countPublishedTrainingsWithTrainingTimeInYearMonthRange(
+                any(Integer.class), any(Integer.class))).thenReturn(0);
+        when(homeScreenStatsMapper.selectTrainingTrendByTrainingYearMonthRange(
+                any(Integer.class), any(Integer.class))).thenReturn(Collections.emptyList());
         when(homeScreenStatsMapper.selectDistinctOutboundYears()).thenReturn(Collections.emptyList());
         when(homeScreenStatsMapper.selectDistinctAppointmentYears()).thenReturn(Collections.emptyList());
         when(homeScreenStatsMapper.selectDistinctSubsidyYears()).thenReturn(Collections.emptyList());

baqing-admin/src/test/java/com/ruoyi/web/modules/screen/support/HomeScreenSupportTest.java

@@ -15,7 +15,9 @@ import org.junit.jupiter.api.Test;
 import com.ruoyi.web.modules.industryservice.domain.dto.BreedingIndustryYakSnapshot;
 import com.ruoyi.web.modules.industryservice.support.BreedingIndustryRules;
 import com.ruoyi.web.modules.screen.domain.dto.HomeScreenAppointmentStatDto;
+import com.ruoyi.web.modules.screen.domain.dto.HomeScreenAppointmentStatDto;
 import com.ruoyi.web.modules.screen.domain.dto.HomeScreenMonthCountDto;
+import com.ruoyi.web.modules.screen.domain.dto.HomeScreenTrainingMonthDto;
 import com.ruoyi.web.modules.screen.domain.vo.HomeScreenAgriClassroomVo;
 import com.ruoyi.web.modules.screen.domain.vo.HomeScreenAppointmentVo;
 import com.ruoyi.web.modules.screen.domain.vo.HomeScreenAgeBandVo;
@@ -141,12 +143,30 @@ class HomeScreenSupportTest
         HomeScreenAppointmentStatDto vet = appt(null, 1, 2);
         HomeScreenAppointmentStatDto expert = appt(null, 3, 1);
         HomeScreenAppointmentVo vo = HomeScreenSupport.buildAppointment(
-                Arrays.asList(vet, expert), Collections.emptyList(), LocalDate.of(2026, 5, 20));
+                Arrays.asList(vet, expert), Collections.emptyList(), YearMonth.of(2026, 7));
         assertEquals(2, vo.getAnnualVetCount());
         assertEquals(1, vo.getAnnualExpertCount());
         assertEquals(12, vo.getMonthlyStacked().size());
     }
 
+    @Test
+    @DisplayName("DP-SY-UT-011b 预约滚动 12 月堆叠")
+    void ut011b_rolling12MonthAppointment()
+    {
+        YearMonth anchor = YearMonth.of(2026, 7);
+        HomeScreenAppointmentStatDto row = new HomeScreenAppointmentStatDto();
+        row.setStatYear(2026);
+        row.setStatMonth(5);
+        row.setProviderType(1);
+        row.setCount(3);
+        HomeScreenAppointmentVo vo = HomeScreenSupport.buildAppointment(
+                Collections.emptyList(), Collections.singletonList(row), anchor);
+        assertEquals(12, vo.getMonthlyStacked().size());
+        assertEquals(2026, vo.getMonthlyStacked().get(9).getStatYear());
+        assertEquals(5, vo.getMonthlyStacked().get(9).getMonth());
+        assertEquals(3, vo.getMonthlyStacked().get(9).getVetCount());
+    }
+
     @Test
     @DisplayName("DP-SY-UT-013 补贴万元换算")
     void ut013_subsidyWan()
@@ -181,12 +201,31 @@ class HomeScreenSupportTest
         assertFalse(vo.isHasAgriData());
     }
 
+    @Test
+    @DisplayName("DP-SY-UT-017b 培训滚动 12 月")
+    void ut017b_rolling12MonthTraining()
+    {
+        YearMonth anchor = YearMonth.of(2026, 7);
+        HomeScreenTrainingMonthDto row = new HomeScreenTrainingMonthDto();
+        row.setStatYear(2026);
+        row.setStatMonth(3);
+        row.setActivityCount(1);
+        row.setEnrolledCount(20);
+        HomeScreenTrainingTrendVo vo = HomeScreenSupport.buildTrainingTrend(
+                Collections.singletonList(row), true, anchor);
+        assertEquals(12, vo.getMonthly().size());
+        assertEquals(2026, vo.getMonthly().get(7).getStatYear());
+        assertEquals(3, vo.getMonthly().get(7).getMonth());
+        assertEquals(1, vo.getMonthly().get(7).getActivityCount());
+        assertEquals(20, vo.getMonthly().get(7).getEnrolledCount());
+    }
+
     @Test
     @DisplayName("DP-SY-UT-018 无培训空态")
     void ut018_noTraining()
     {
         HomeScreenTrainingTrendVo vo = HomeScreenSupport.buildTrainingTrend(
-                Collections.emptyList(), false, LocalDate.of(2026, 5, 20));
+                Collections.emptyList(), false, YearMonth.of(2026, 5));
         assertFalse(vo.isHasTrainingData());
         assertEquals(12, vo.getMonthly().size());
     }

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

@@ -39,7 +39,7 @@
 | 类型 | 适用区块 | 横轴规则 |
 | --- | --- | --- |
 | **统计年 Y 内 12 月** | 线下服务预约堆叠柱、实战培训报名趋势等 | 固定 **1 月～12 月** 共 12 个刻度，数据范围限定在 **Y 年** |
-| **滚动最近 12 个月** | **牦牛存栏变动**、**牦牛出栏统计** | 以服务器当前年月为锚点，取**含当月在内向前连续 12 个自然月**；**不**随页面「统计年份 **Y**」切换 |
+| **滚动最近 12 个月** | **牦牛存栏变动**、**牦牛出栏统计**、**线下服务预约**（堆叠柱）、**实战培训报名** | 以服务器当前年月为锚点，取**含当月在内向前连续 12 个自然月**；**不**随页面「统计年份 **Y**」切换 |
 
 **统计年 Y 内 12 月（预约、培训等）**
 
@@ -344,7 +344,8 @@ flowchart TB
 | 项 | 规则 |
 | --- | --- |
 | 左侧 | 三类**年度预约合计**卡片：兽医人员、专家人员、诊疗机构（**§2.7**） |
-| 右侧 | **堆叠柱状图**：横轴 12 月；系列为兽医/专家/机构预约人次 |
+| 右侧 | **堆叠柱状图**：**§2.3 滚动最近 12 月**；系列为兽医/专家/机构预约人次 |
+| 横轴 / 悬停 | 横轴**仅月份**；悬停显示 **YYYY年M月** 及三类人次 |
 | 图例 | 与三类名称一致，颜色区分 |
 
 ---
@@ -387,8 +388,9 @@ flowchart TB
 | --- | --- |
 | 图表类型 | 双系列**曲线/面积图**（以原型为准） |
 | 系列 | **活动数**（个）、**报名人数**（人） |
-| 横轴 | **§2.3** 1～12 月 |
-| 口径 | **§2.11** |
+| 横轴 | **§2.3 滚动最近 12 月** |
+| 横轴 / 悬停 | 横轴**仅月份**；悬停显示 **YYYY年M月** 及活动数、报名人数 |
+| 口径 | **§2.11**（窗口内 `training_time`） |
 
 ---
 

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

@@ -22,8 +22,8 @@
 | 数据权限 | **全县**聚合：牦牛、牧场取全部 `biz_status=1` 且 `del_flag=0` 的牧场 ID（与疫病风险大屏一致，**不按**登录用户牧场过滤）；草场全县 `del_flag=0` |
 | 统计日 | `Y = 当前年` → `statDate = 今日`；`Y` 为历史年 → `statDate = Y-12-31`（时点、月末还原、年出栏上界均据此） |
 | 主数据三项 | 供应商 / 承销商 / 交易市场**实时快照**，**不**随 `statYear` 变 |
-| 按月图表（预约、培训等） | 横轴固定 **12** 月（**Y** 年内）；缺月、当前年未来月均为 **0** |
-| 滚动 12 月图表（存栏变动、出栏统计） | 锚点 = 服务器当前 `YearMonth`（`Asia/Shanghai`）；窗口 = 锚点向前 11 月～锚点；固定 **12** 条；**不**随 `statYear` 变 |
+| 滚动 12 月图表 | 存栏变动、出栏统计、预约堆叠、培训趋势；锚点 = 当前 `YearMonth`；**不**随 `statYear` 变 |
+| 按月图表（Y 年内） | 已无（预约/培训已并入滚动 12 月） |
 | 性能 | 默认实时聚合；可选 **§2.3** 缓存表 |
 
 **依赖表（只读）**
@@ -285,7 +285,9 @@
 | 字段 | 说明 |
 | --- | --- |
 | `annualVetCount` / `annualExpertCount` / `annualOrgCount` | 三类年度合计 |
-| `monthlyStacked[]` | 12 条：`month`、`vetCount`、`expertCount`、`orgCount` |
+| `monthlyStacked[]` | 固定 **12** 条；滚动最近 12 自然月；**不**随 `statYear` 变 |
+
+`monthlyStacked[]`：`statYear`、`month`、`vetCount`、`expertCount`、`orgCount`（缺月各计数为 **0**）。
 
 #### 3.1.7 `subsidy`
 
@@ -307,10 +309,10 @@
 
 | 字段 | 说明 |
 | --- | --- |
-| `hasTrainingData` | **Y** 年是否存在已发布培训 |
-| `monthly[]` | 12 条：`month`、`activityCount`、`enrolledCount` |
+| `hasTrainingData` | 滚动 12 月窗口内是否存在已发布且 `training_time` 落在窗口内的培训 |
+| `monthly[]` | 固定 **12** 条；`statYear`、`month`、`activityCount`、`enrolledCount` |
 
-`hasTrainingData=false` 时 `monthly` 可为 `[]` 或全 0（前端以 `hasTrainingData` 走空态）。
+`hasTrainingData=false` 时 `monthly` 仍为 12 条全 0（前端以 `hasTrainingData` 走空态）。
 
 #### 响应示例（节选）
 
@@ -450,15 +452,15 @@
 
 **工程**：`ruoyi-screen/src/views/home/`（`index.vue`、`chartOptions.js`）。
 
-### 4.1 存栏变动 / 出栏统计图表
+### 4.1 滚动 12 月图表（存栏 / 出栏 / 预约 / 培训）
 
 | 项 | 实现 |
 | --- | --- |
-| 数据字段 | `inventoryChange.monthlyTrend[]`、`outboundMonthly[]`；按 `statYear`、`month` 升序 |
-| 横轴 | **仅月份**标签（`8月`）；`buildInventoryTrendOption` / `buildOutboundOption` |
+| 数据字段 | `monthlyTrend[]`、`outboundMonthly[]`、`appointment.monthlyStacked[]`、`trainingTrend.monthly[]` |
+| 排序 | 按 `statYear`、`month` 升序 |
+| 横轴 | **仅月份**（`8月`）；`chartOptions.js` |
 | Tooltip | **完整年月**（`2025年8月`）+ 数值 |
-| 出栏图 | **纯柱状图**，无趋势折线 |
-| 与 `statYear` | 切换年份**不**改变上述两图数据窗口 |
+| 与 `statYear` | 切换年份**不**改变上述图表数据窗口 |
 
 ---
 
@@ -487,5 +489,6 @@ SQL 示例：`sql/big_screen_home_perm.sql`（挂载「大屏」父菜单下）
 
 | 版本 | 日期 | 说明 |
 | --- | --- | --- |
+| 1.2 | 2026-07-04 | 预约堆叠、培训趋势改滚动 12 月 + statYear；前端横轴/Tooltip 与存栏出栏一致 |
 | 1.1 | 2026-07-04 | 存栏/出栏改填报表滚动 12 月；VO 增 `statYear`；年龄四档；地图/总览最近填报年月；§4 前端横轴/Tooltip |
 | 1.0 | 2026-05-20 | 初稿：无新表；双接口；对齐 `大屏首页功能需求.md` v1.0 |

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

@@ -11,7 +11,7 @@
 | --- | --- |
 | 统计年 **Y** | 切换后全页一致；默认当前自然年 |
 | 统计日 | `Y`=当前年→今日；历史年→`Y-12-31` |
-| 按月图表（预约、培训） | 固定 12 月（**Y** 年内）；缺月、当前年未来月=**0** |
+| 按月图表（预约、培训） | 已改为**滚动 12 月**（与存栏/出栏一致）；含 `statYear`+`month`；**不**随 **Y** |
 | 滚动 12 月（存栏变动、出栏统计） | 锚点=当前年月；含 `statYear`+`month`；**不**随 **Y**；缺月=**0** |
 | 牦牛填报 | `biz_yak_herd_inventory` / `biz_yak_outbound_report` 全县合计；最近填报年月 |
 | 流通三项 | 供应商/承销商/交易市场**实时快照**，**不随 Y** |
@@ -143,10 +143,10 @@
 | DP-SY-UI-008 | 图表 | 出栏柱状 12 月 | UI 测试 | Playwright+Chrome | SY-06 | `OUT-R12` | 查看出栏统计+悬停 | 12 柱、**无趋势折线**；横轴仅月；悬停显年月+头数 |
 | DP-SY-UI-009 | 图表 | 草场可用/使用中 | UI 测试 | Playwright+Chrome | SY-07 | `GRASS-MIX` | 查看草场区上部 | 两数字区分「可用」「使用中」；不与退化表简单相加为总量 |
 | DP-SY-UI-010 | 图表 | 退化等级占比 | UI 测试 | Playwright+Chrome | SY-07 | 五档均有 | 查看退化表/环图 | 五档名称与 API 一致；占比为 % |
-| DP-SY-UI-011 | 图表 | 预约堆叠柱 | UI 测试 | Playwright+Chrome | SY-08 | `APT-Y` | 查看预约区 | 左侧三类年度卡片；右侧 12 月堆叠；图例兽医/专家/机构 |
+| DP-SY-UI-011 | 图表 | 预约堆叠柱 | UI 测试 | Playwright+Chrome | SY-08 | `APT-Y` | 查看预约区+悬停 | 左侧三类年度卡片；右侧滚动 12 月堆叠；横轴仅月；悬停显年月 |
 | DP-SY-UI-012 | 图表 | 补贴三类柱图 | UI 测试 | Playwright+Chrome | SY-09 | `SUB-Y` | 查看惠农补贴 | 横轴三类；纵轴万元；与 API 一致 |
 | DP-SY-UI-013 | 指标 | 农技课堂 | UI 测试 | Playwright+Chrome | SY-11 | `VIDEO-Y`+培训 | 查看农技课堂 | 视频数、培训场次、培训内容合计正确 |
-| DP-SY-UI-014 | 图表 | 培训双曲线 | UI 测试 | Playwright+Chrome | SY-12 | `TRAIN-PUB` | 查看培训报名趋势 | 活动数、报名人数两系列；12 月 |
+| DP-SY-UI-014 | 图表 | 培训双曲线 | UI 测试 | Playwright+Chrome | SY-12 | `TRAIN-PUB` | 查看培训报名趋势+悬停 | 活动数、报名人数两系列；横轴仅月；悬停显年月 |
 | DP-SY-UI-015 | 空态 | 无出栏 | UI 测试 | Playwright+Chrome | §7.1 | 选无出栏年 | 切换该年 | 出栏图空态或全 0；年出栏卡片为 0 |
 | DP-SY-UI-016 | 空态 | 无存栏趋势 | UI 测试 | Playwright+Chrome | §7.1 | `HERD-EMPTY` | 打开页 | 趋势图空态或全 0 折线；年龄结构空态 |
 | DP-SY-UI-017 | 空态 | 无预约 | UI 测试 | Playwright+Chrome | §7.1 | 无预约年 | 切换该年 | 预约区空态；三类年度卡片为 0 |