大屏查询

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

@@ -33,8 +33,12 @@ public class HomeScreenDashboardVo
     private HomeScreenEnterpriseFinanceVo largeLivestockFarmerFinance;
     /** 合作社经营模式分类 */
     private List<HomeScreenNamedCountItemVo> cooperativeBusinessModel;
-    /** 农牧户分类 */
-    private List<HomeScreenNamedCountItemVo> farmerHouseholdClassification;
+    // /** 农牧户分类（本期首页不展示） */
+    // private List<HomeScreenNamedCountItemVo> farmerHouseholdClassification;
+    /**
+     * 各乡镇农牧户补助合计：所选年最大填报月，按乡镇汇总各村 {@code subsidy_total}（补助合计金额）。
+     */
+    private List<HomeScreenTownSubsidyItemVo> townSubsidyTotals;
     /** 人均收入：以库中最大所属年为终点的最近 5 年趋势（农村可支配收入 / 脱贫人均纯收入） */
     private List<HomeScreenPerCapitaIncomeYearVo> perCapitaIncomeTrend;
 
@@ -158,14 +162,24 @@ public class HomeScreenDashboardVo
         this.cooperativeBusinessModel = cooperativeBusinessModel;
     }
 
-    public List<HomeScreenNamedCountItemVo> getFarmerHouseholdClassification()
+    // public List<HomeScreenNamedCountItemVo> getFarmerHouseholdClassification()
+    // {
+    //     return farmerHouseholdClassification;
+    // }
+    //
+    // public void setFarmerHouseholdClassification(List<HomeScreenNamedCountItemVo> farmerHouseholdClassification)
+    // {
+    //     this.farmerHouseholdClassification = farmerHouseholdClassification;
+    // }
+
+    public List<HomeScreenTownSubsidyItemVo> getTownSubsidyTotals()
     {
-        return farmerHouseholdClassification;
+        return townSubsidyTotals;
     }
 
-    public void setFarmerHouseholdClassification(List<HomeScreenNamedCountItemVo> farmerHouseholdClassification)
+    public void setTownSubsidyTotals(List<HomeScreenTownSubsidyItemVo> townSubsidyTotals)
     {
-        this.farmerHouseholdClassification = farmerHouseholdClassification;
+        this.townSubsidyTotals = townSubsidyTotals;
     }
 
     public List<HomeScreenPerCapitaIncomeYearVo> getPerCapitaIncomeTrend()

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

@@ -15,7 +15,6 @@ import com.ruoyi.web.modules.screen.domain.dto.HomeScreenHerdYakStructureSumDto;
 import com.ruoyi.web.modules.screen.domain.dto.HomeScreenCoopBusinessModelSumDto;
 import com.ruoyi.web.modules.screen.domain.dto.HomeScreenDisposableIncomeYearDto;
 import com.ruoyi.web.modules.screen.domain.dto.HomeScreenEnterpriseFinanceSumDto;
-import com.ruoyi.web.modules.screen.domain.dto.HomeScreenFarmerHouseholdClassSumDto;
 import com.ruoyi.web.modules.screen.domain.dto.HomeScreenMonthCountDto;
 import com.ruoyi.web.modules.screen.domain.dto.HomeScreenOutboundSpeciesSumDto;
 import com.ruoyi.web.modules.screen.domain.dto.HomeScreenSelfConsumptionSumDto;
@@ -23,6 +22,7 @@ import com.ruoyi.web.modules.screen.domain.dto.HomeScreenStatPeriodDto;
 import com.ruoyi.web.modules.screen.domain.dto.HomeScreenSubsidyTypeSumDto;
 import com.ruoyi.web.modules.screen.domain.dto.HomeScreenTrainingMonthDto;
 import com.ruoyi.web.modules.screen.domain.vo.HomeScreenTownMapMarkerVo;
+import com.ruoyi.web.modules.screen.domain.vo.HomeScreenTownSubsidyItemVo;
 import com.ruoyi.web.modules.screen.domain.vo.HomeScreenBreedingEntityQuantityListItemVo;
 import com.ruoyi.web.modules.screen.domain.vo.HomeScreenYakInventoryOutboundListItemVo;
 
@@ -219,8 +219,14 @@ public interface HomeScreenStatsMapper
     HomeScreenCoopBusinessModelSumDto countCooperativeBusinessModelByStatYearMonth(
             @Param("statYear") int statYear, @Param("statMonth") int statMonth);
 
-    /** 指定年月农牧户分类计数（各「是」标记记录数） */
-    HomeScreenFarmerHouseholdClassSumDto countFarmerHouseholdClassByStatYearMonth(
+    // /** 指定年月农牧户分类计数（各「是」标记记录数） */
+    // HomeScreenFarmerHouseholdClassSumDto countFarmerHouseholdClassByStatYearMonth(
+    //         @Param("statYear") int statYear, @Param("statMonth") int statMonth);
+
+    /**
+     * 指定年月各乡镇农牧户补助合计金额（各村 {@code subsidy_total} 之和）。
+     */
+    List<HomeScreenTownSubsidyItemVo> sumFarmerHouseholdSubsidyTotalByTownStatYearMonth(
             @Param("statYear") int statYear, @Param("statMonth") int statMonth);
 
     /** 指定年份区间可支配收入（含起止年） */

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

@@ -45,6 +45,7 @@ import com.ruoyi.web.modules.screen.domain.vo.HomeScreenPerCapitaIncomeListItemV
 import com.ruoyi.web.modules.screen.domain.vo.HomeScreenStandardListItemVo;
 import com.ruoyi.web.modules.screen.domain.vo.HomeScreenTownMapMarkerVo;
 import com.ruoyi.web.modules.screen.domain.vo.HomeScreenTownMapVo;
+import com.ruoyi.web.modules.screen.domain.vo.HomeScreenTownSubsidyItemVo;
 import com.ruoyi.web.modules.screen.domain.vo.HomeScreenYakHerdInventoryListItemVo;
 import com.ruoyi.web.modules.screen.domain.vo.HomeScreenBreedingEntityQuantityListItemVo;
 import com.ruoyi.web.modules.screen.domain.vo.HomeScreenYakInventoryOutboundListItemVo;
@@ -195,7 +196,7 @@ public class HomeScreenServiceImpl implements IHomeScreenService
                     homeScreenStatsMapper.sumLargeLivestockFarmerFinanceByStatYearMonth(
                             yearLargeFarmer.getStatYear(), yearLargeFarmer.getStatMonth())));
         }
-        // 合作社经营模式 / 农牧户分类：所选年最大填报月
+        // 合作社经营模式：所选年最大填报月
         if (yearCooperative == null)
         {
             vo.setCooperativeBusinessModel(HomeScreenSupport.buildCooperativeBusinessModel(null));
@@ -206,15 +207,28 @@ public class HomeScreenServiceImpl implements IHomeScreenService
                     homeScreenStatsMapper.countCooperativeBusinessModelByStatYearMonth(
                             yearCooperative.getStatYear(), yearCooperative.getStatMonth())));
         }
+        // 农牧户分类（本期不展示，改回乡镇补助合计）
+        // if (yearFarmerHousehold == null)
+        // {
+        //     vo.setFarmerHouseholdClassification(HomeScreenSupport.buildFarmerHouseholdClassification(null));
+        // }
+        // else
+        // {
+        //     vo.setFarmerHouseholdClassification(HomeScreenSupport.buildFarmerHouseholdClassification(
+        //             homeScreenStatsMapper.countFarmerHouseholdClassByStatYearMonth(
+        //                     yearFarmerHousehold.getStatYear(), yearFarmerHousehold.getStatMonth())));
+        // }
+        // 各乡镇补助合计：所选年农牧户最大填报月，按乡镇汇总各村 subsidy_total
         if (yearFarmerHousehold == null)
         {
-            vo.setFarmerHouseholdClassification(HomeScreenSupport.buildFarmerHouseholdClassification(null));
+            vo.setTownSubsidyTotals(Collections.emptyList());
         }
         else
         {
-            vo.setFarmerHouseholdClassification(HomeScreenSupport.buildFarmerHouseholdClassification(
-                    homeScreenStatsMapper.countFarmerHouseholdClassByStatYearMonth(
-                            yearFarmerHousehold.getStatYear(), yearFarmerHousehold.getStatMonth())));
+            List<HomeScreenTownSubsidyItemVo> townSubsidies =
+                    homeScreenStatsMapper.sumFarmerHouseholdSubsidyTotalByTownStatYearMonth(
+                            yearFarmerHousehold.getStatYear(), yearFarmerHousehold.getStatMonth());
+            vo.setTownSubsidyTotals(townSubsidies != null ? townSubsidies : Collections.emptyList());
         }
         // 人均收入：以库中最大所属年为终点，向前共 5 年（与所选年无关）
         Integer incomeEndYear = homeScreenStatsMapper.selectLatestDisposableIncomeStatYear();

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

@@ -539,6 +539,19 @@
           and stat_month = #{statMonth}
     </select>
 
+    <!-- 所选年月各乡镇补助合计金额（村级 subsidy_total 之和） -->
+    <select id="sumFarmerHouseholdSubsidyTotalByTownStatYearMonth"
+            resultType="com.ruoyi.web.modules.screen.domain.vo.HomeScreenTownSubsidyItemVo">
+        select town_dept_id as townDeptId,
+               max(town_name) as townName,
+               coalesce(sum(subsidy_total), 0) as subsidyTotal
+        from biz_farmer_household
+        where stat_year = #{statYear}
+          and stat_month = #{statMonth}
+        group by town_dept_id
+        order by town_dept_id asc
+    </select>
+
     <select id="selectDisposableIncomeByYearRange"
             resultType="com.ruoyi.web.modules.screen.domain.dto.HomeScreenDisposableIncomeYearDto">
         select stat_year as statYear,

baqing-admin/src/test/java/com/ruoyi/web/modules/screen/controller/HomeScreenControllerApiTest.java

@@ -509,7 +509,8 @@ class HomeScreenControllerApiTest
         vo.setFamilyRanchFinance(new com.ruoyi.web.modules.screen.domain.vo.HomeScreenEnterpriseFinanceVo());
         vo.setLargeLivestockFarmerFinance(new com.ruoyi.web.modules.screen.domain.vo.HomeScreenEnterpriseFinanceVo());
         vo.setCooperativeBusinessModel(new ArrayList<>());
-        vo.setFarmerHouseholdClassification(new ArrayList<>());
+        // vo.setFarmerHouseholdClassification(new ArrayList<>());
+        vo.setTownSubsidyTotals(new ArrayList<>());
         vo.setPerCapitaIncomeTrend(new ArrayList<>());
         return vo;
     }

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

@@ -35,6 +35,8 @@ class HomeScreenStatsMapperXmlTest
         assertTrue(xml.contains("sumLargeLivestockFarmerFinanceByStatYearMonth"));
         assertTrue(xml.contains("countCooperativeBusinessModelByStatYearMonth"));
         assertTrue(xml.contains("countFarmerHouseholdClassByStatYearMonth"));
+        assertTrue(xml.contains("sumFarmerHouseholdSubsidyTotalByTownStatYearMonth"));
+        assertTrue(xml.contains("subsidy_total"));
         assertTrue(xml.contains("selectDisposableIncomeByYearRange"));
         assertTrue(xml.contains("selectLatestDisposableIncomeStatYear"));
         assertTrue(xml.contains("biz_disposable_income"));

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

@@ -37,7 +37,6 @@ import com.ruoyi.web.modules.industryservice.mapper.BizYakOutboundReportMapper;
 import com.ruoyi.web.modules.screen.domain.dto.HomeScreenCoopBusinessModelSumDto;
 import com.ruoyi.web.modules.screen.domain.dto.HomeScreenDisposableIncomeYearDto;
 import com.ruoyi.web.modules.screen.domain.dto.HomeScreenEnterpriseFinanceSumDto;
-import com.ruoyi.web.modules.screen.domain.dto.HomeScreenFarmerHouseholdClassSumDto;
 import com.ruoyi.web.modules.screen.domain.dto.HomeScreenHerdSpeciesSumDto;
 import com.ruoyi.web.modules.screen.domain.dto.HomeScreenHerdYakStructureSumDto;
 import com.ruoyi.web.modules.screen.domain.dto.HomeScreenOutboundSpeciesSumDto;
@@ -56,6 +55,7 @@ import com.ruoyi.web.modules.screen.domain.vo.HomeScreenYakInventoryOutboundList
 import com.ruoyi.web.modules.screen.domain.vo.HomeScreenYakOutboundReportListItemVo;
 import com.ruoyi.web.modules.screen.domain.vo.HomeScreenTownMapMarkerVo;
 import com.ruoyi.web.modules.screen.domain.vo.HomeScreenTownMapVo;
+import com.ruoyi.web.modules.screen.domain.vo.HomeScreenTownSubsidyItemVo;
 import com.ruoyi.web.modules.screen.mapper.HomeScreenStandardMapper;
 import com.ruoyi.web.modules.screen.mapper.HomeScreenStatsMapper;
 import com.ruoyi.web.modules.industryservice.support.TownDeptSupport;
@@ -741,8 +741,8 @@ class HomeScreenServiceImplTest
     }
 
     @Test
-    @DisplayName("DP-SY-UT-036 合作社经营模式与农牧户分类取所选年最大填报月")
-    void ut036_coopModelAndFarmerClass()
+    @DisplayName("DP-SY-UT-036 合作社经营模式与乡镇补助合计取所选年最大填报月")
+    void ut036_coopModelAndTownSubsidy()
     {
         stubGrasslandAndReport();
         stubOtherBlocks();
@@ -758,22 +758,21 @@ class HomeScreenServiceImplTest
         coop.setCompanyTypeCount(0);
         coop.setOtherCount(1);
         when(homeScreenStatsMapper.countCooperativeBusinessModelByStatYearMonth(2024, 7)).thenReturn(coop);
-        HomeScreenFarmerHouseholdClassSumDto farmer = new HomeScreenFarmerHouseholdClassSumDto();
-        farmer.setPureHerderCount(8);
-        farmer.setNoLivestockCount(4);
-        farmer.setExtinctHouseholdCount(1);
-        farmer.setOverloadHerderCount(2);
-        farmer.setNeedCapCount(3);
-        farmer.setNeedFloorCount(5);
-        when(homeScreenStatsMapper.countFarmerHouseholdClassByStatYearMonth(2024, 5)).thenReturn(farmer);
+        HomeScreenTownSubsidyItemVo town = new HomeScreenTownSubsidyItemVo();
+        town.setTownDeptId(101L);
+        town.setTownName("巴青镇");
+        town.setSubsidyTotal(new BigDecimal("12345.67"));
+        when(homeScreenStatsMapper.sumFarmerHouseholdSubsidyTotalByTownStatYearMonth(2024, 5))
+                .thenReturn(Collections.singletonList(town));
 
         HomeScreenDashboardVo vo = service.loadDashboard("2024");
 
         assertEquals(6, vo.getCooperativeBusinessModel().size());
         assertEquals(3, vo.getCooperativeBusinessModel().get(0).getCount());
-        assertEquals(6, vo.getFarmerHouseholdClassification().size());
-        assertEquals(8, vo.getFarmerHouseholdClassification().get(0).getCount());
-        assertEquals(5, vo.getFarmerHouseholdClassification().get(5).getCount());
+        assertEquals(1, vo.getTownSubsidyTotals().size());
+        assertEquals(101L, vo.getTownSubsidyTotals().get(0).getTownDeptId().longValue());
+        assertEquals("巴青镇", vo.getTownSubsidyTotals().get(0).getTownName());
+        assertEquals(0, new BigDecimal("12345.67").compareTo(vo.getTownSubsidyTotals().get(0).getSubsidyTotal()));
     }
 
     @Test

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

@@ -87,7 +87,8 @@
 | **企业年度收入与补助-家庭牧场** | 所选年 **Y** 内 `biz_family_ranch` 最大填报月全县 `income`/`expense`/`profit`/`subsidy_amount` 合计；柱状图；单位**万元**；字段 **`familyRanchFinance`** |
 | **企业年度收入与补助-养殖大户** | 所选年 **Y** 内 `biz_large_livestock_farmer` 最大填报月全县同上四项合计；柱状图；单位**万元**；字段 **`largeLivestockFarmerFinance`** |
 | **合作社经营模式分类** | 所选年 **Y** 内 `biz_cooperative_development` 最大填报月按 `business_model` 计数（整村/股份/联合/多种经营/公司型/其他）；饼图；单位**个**；字段 **`cooperativeBusinessModel`** |
-| **农牧户分类** | 所选年 **Y** 内 `biz_farmer_household` 最大填报月各分类标记为「是」的村级记录数（纯牧户/无畜户/绝户/超载牧户/需要封顶/需要保底）；柱状图；单位**个**；字段 **`farmerHouseholdClassification`** |
+| ~~**农牧户分类**~~ | ~~所选年 **Y** 内 `biz_farmer_household` 最大填报月各分类标记为「是」的村级记录数；本期首页不展示~~ |
+| **补助奖励资金（按乡镇列表）** | 所选年 **Y** 内 `biz_farmer_household` **最大填报月**，按乡镇汇总各村 `subsidy_total`（补助合计金额 = 补助奖励总资金 + 封顶保底后享受补助奖励总资金 + 村级草原监督员补助）；首页标题「补助奖励资金」，列表展示乡镇名与金额；字段 **`townSubsidyTotals`**（`townDeptId` / `townName` / `subsidyTotal`） |
 | **人均收入** | `biz_disposable_income` 以库中**最大所属年**为终点向前共 5 年双折线：农村居民人均可支配收入、脱贫人口人均纯收入；缺年补 0；无数据则空；单位**元**；**不随所选年 Y 切换**；字段 **`perCapitaIncomeTrend`** |
 | **人均收入明细** | 独立接口分页查询 `biz_disposable_income`；条件：所属年份（可选，**未传不过滤**）；按**所属年份倒序**；返回年份、农村居民人均可支配收入、增幅、增速、脱贫人口人均纯收入 |
 | **农牧户数据明细** | 独立接口分页查询 `biz_farmer_household`；条件：年（可选，**未传不过滤**）、月（可选，**未传不过滤**）、乡镇、村；按**年、月倒序**；返回全部业务列表字段 |
@@ -503,6 +504,7 @@ flowchart TB
 
 | 版本 | 日期 | 说明 |
 | --- | --- | --- |
+| 1.23 | 2026-08-18 | 首页屏蔽农牧户分类展示；新增 `townSubsidyTotals`（所选年最大月按乡镇汇总补助合计金额 `subsidy_total`） |
 | 1.22 | 2026-08-18 | 大屏明细分页：年份未传一律不过滤（跨年全量翻页）；含人均收入/农牧户/合作社/家庭牧场/养殖大户/出栏/存栏/有无畜户 |
 | 1.21 | 2026-08-18 | 大屏明细分页：月份未传一律不过滤（该年全年）；年份未传仍默认当前年。含合作社/家庭牧场/养殖大户/出栏/存栏/有无畜户 |
 | 1.19 | 2026-07-24 | 人均收入趋势改为以库中最大所属年为终点的最近 5 年 |

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

@@ -242,7 +242,9 @@
 | `livestockOutboundStructure` | array | 牲畜出栏结构 |
 | `selfConsumption` | object | 自食情况 |
 | `familyRanchFinance` / `largeLivestockFarmerFinance` | object | 企业年度收入与补助 |
-| `cooperativeBusinessModel` / `farmerHouseholdClassification` | array | 合作社模式 / 农牧户分类 |
+| `cooperativeBusinessModel` | array | 合作社经营模式分类 |
+| `townSubsidyTotals` | array | 各乡镇补助合计：`townDeptId` / `townName` / `subsidyTotal`（所选年最大填报月，村级 `subsidy_total` 按乡镇求和；单位元） |
+| ~~`farmerHouseholdClassification`~~ | ~~array~~ | ~~农牧户分类（本期不返回）~~ |
 | `perCapitaIncomeTrend` | array | 人均收入近 5 年 |
 
 > **已屏蔽（不再返回）：** `inventoryChange`（牦牛存栏变动）、`outboundMonthly`（牦牛出栏月度）、`grassland`（草场类型占比）、`subsidy`（惠农补贴发放）；产业总览内 `supplierCount`/`distributorCount`/`tradeMarketCount`/`grasslandCount`；以及此前迁出的预约/农技课堂/培训。
@@ -665,6 +667,7 @@ SQL 示例：`sql/big_screen_home_perm.sql`（挂载「大屏」父菜单下）
 
 | 版本 | 日期 | 说明 |
 | --- | --- | --- |
+| 1.26 | 2026-08-18 | 屏蔽 `farmerHouseholdClassification`；新增看板 `townSubsidyTotals`（所选年最大月按乡镇汇总 `subsidy_total`） |
 | 1.25 | 2026-08-18 | 首页明细分页：年份未传一律不过滤（跨年全量翻页）；含人均收入/农牧户/合作社/家庭牧场/养殖大户/出栏/存栏/有无畜户 |
 | 1.24 | 2026-08-18 | 首页明细分页：月份未传一律不过滤；含合作社/家庭牧场/养殖大户/出栏/存栏/有无畜户（农牧户已在 1.23） |
 | 1.23 | 2026-08-18 | `/farmerHouseholds`：月份未传不过滤（该年全年按月倒序）；年份未传仍默认当前年 |