短信登录

baqing-admin/src/main/java/com/ruoyi/web/modules/screen/controller/HomeScreenController.java

@@ -253,9 +253,9 @@ public class HomeScreenController extends BaseController
 
     /**
      * 养殖主体数量明细（分页）；按年、月倒序。
-     * <p>村×年月键集 = 农牧户 ∪ 合作社，左关联家庭牧场/养殖大户计数；
-     * 仅合作社有数据时仍返回，其余数量为 0。
-     * 条件：年/月/乡镇/村均可选；未传年月不过滤以支持跨多年全量翻页（界面可默认当前年月）。</p>
+     * <p>村×年月键集 = 农牧户 ∪ 合作社 ∪ 家庭牧场 ∪ 养殖大户；
+     * 任一组织形式有数据即可返回，其余数量为 0。
+     * 条件：年/月/乡镇/村均可选；未传年月不过滤以支持跨多年全量翻页（界面默认当前年月）。</p>
      */
     @GetMapping("/breedingEntityQuantities")
     public TableDataInfo breedingEntityQuantities(

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

@@ -3,8 +3,8 @@ package com.ruoyi.web.modules.screen.domain.vo;
 /**
  * 大屏首页 — 养殖主体数量明细行。
  * <p>
- * 村×年月键集 = {@code biz_farmer_household} ∪ {@code biz_cooperative_development}；
- * 左关联家庭牧场 / 养殖大户计数。仅有合作社数据时仍出列，其余数量为 0。
+ * 村×年月键集 = 农牧户 ∪ 合作社 ∪ 家庭牧场 ∪ 养殖大户；
+ * 任一组织形式有数据即可出列，其余数量为 0。
  */
 public class HomeScreenBreedingEntityQuantityListItemVo
 {

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

@@ -241,8 +241,8 @@ public interface HomeScreenStatsMapper
             @Param("villageDeptId") Long villageDeptId);
 
     /**
-     * 养殖主体数量明细：村×年月键集 = 农牧户 ∪ 合作社；左关联家庭牧场/养殖大户计数。
-     * 仅有合作社数据时仍返回行，农牧户/家庭牧场/养殖大户为 0。年月未传不过滤，支持跨多年翻页。
+     * 养殖主体数量明细：村×年月键集 = 农牧户 ∪ 合作社 ∪ 家庭牧场 ∪ 养殖大户。
+     * 任一组织形式有数据即可出列，其余为 0。年月未传不过滤，支持跨多年翻页。
      */
     List<HomeScreenBreedingEntityQuantityListItemVo> selectBreedingEntityQuantityList(
             @Param("statYear") Integer statYear,

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

@@ -123,8 +123,8 @@ public interface IHomeScreenService
 
     /**
      * 养殖主体数量明细（分页；按年、月倒序）。
-     * 村×年月键集来自农牧户 ∪ 合作社；左关联家庭牧场/养殖大户计数。
-     * 仅合作社有数据时仍可查出，其他数量为 0。年月未传不过滤，支持跨多年全量翻页（前端筛选项可默认当前年月）。
+     * 村×年月键集 = 农牧户 ∪ 合作社 ∪ 家庭牧场 ∪ 养殖大户（不同组织形式）。
+     * 任一形式有数据即可查出，其余数量为 0。年月未传不过滤，支持跨多年全量翻页（界面默认当前年月）。
      */
     List<HomeScreenBreedingEntityQuantityListItemVo> listBreedingEntityQuantities(
             Integer statYear, Integer statMonth, Long townDeptId, Long villageDeptId);

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

@@ -635,33 +635,31 @@
         order by t.stat_year desc, t.stat_month desc, t.town_dept_id asc, t.village_dept_id asc
     </select>
 
-    <!--
-      养殖主体数量明细：农牧户主表驱动；相关计数用相关子查询（仅对本页行求值，利于跨年分页）；
-      ORDER BY 对齐 uk(stat_year,stat_month,village_dept_id)。
-    -->
     <!--
       养殖主体数量明细：
-      键集 = 农牧户 ∪ 合作社（村×年月）；无农牧户仅有合作社时仍出列，农牧户/家庭牧场/养殖大户为 0。
-      家庭牧场、养殖大户按同键左关联计数。排序年、月倒序，便于 PageHelper 跨多年翻页。
+      键集 = 农牧户 ∪ 合作社 ∪ 家庭牧场 ∪ 养殖大户（村×年月）；
+      任一组织形式有数据即可出列，其余数量为 0。排序年、月倒序，PageHelper 支持跨多年翻页。
     -->
     <select id="selectBreedingEntityQuantityList"
             resultType="com.ruoyi.web.modules.screen.domain.vo.HomeScreenBreedingEntityQuantityListItemVo">
         select k.stat_year as statYear,
                k.stat_month as statMonth,
-               coalesce(h.town_dept_id, c.town_dept_id) as townDeptId,
-               coalesce(h.town_name, c.town_name) as townName,
+               coalesce(h.town_dept_id, c.town_dept_id, f.town_dept_id, l.town_dept_id) as townDeptId,
+               coalesce(h.town_name, c.town_name, f.town_name, l.town_name) as townName,
                k.village_dept_id as villageDeptId,
-               coalesce(h.village_name, c.village_name) as villageName,
+               coalesce(h.village_name, c.village_name, f.village_name, l.village_name) as villageName,
                coalesce(h.household_count, 0) as farmerHouseholdCount,
                coalesce(c.cooperative_count, 0) as cooperativeCount,
                coalesce(f.family_ranch_count, 0) as familyRanchCount,
                coalesce(l.large_farmer_count, 0) as largeLivestockFarmerCount
         from (
-            select stat_year, stat_month, village_dept_id
-            from biz_farmer_household
+            select stat_year, stat_month, village_dept_id from biz_farmer_household
             union
-            select stat_year, stat_month, village_dept_id
-            from biz_cooperative_development
+            select stat_year, stat_month, village_dept_id from biz_cooperative_development
+            union
+            select stat_year, stat_month, village_dept_id from biz_family_ranch
+            union
+            select stat_year, stat_month, village_dept_id from biz_large_livestock_farmer
         ) k
         left join biz_farmer_household h
             on h.stat_year = k.stat_year
@@ -682,7 +680,13 @@
            and c.stat_month = k.stat_month
            and c.village_dept_id = k.village_dept_id
         left join (
-            select stat_year, stat_month, village_dept_id, count(*) as family_ranch_count
+            select stat_year,
+                   stat_month,
+                   village_dept_id,
+                   max(town_dept_id) as town_dept_id,
+                   max(town_name) as town_name,
+                   max(village_name) as village_name,
+                   count(*) as family_ranch_count
             from biz_family_ranch
             group by stat_year, stat_month, village_dept_id
         ) f
@@ -690,7 +694,13 @@
            and f.stat_month = k.stat_month
            and f.village_dept_id = k.village_dept_id
         left join (
-            select stat_year, stat_month, village_dept_id, count(*) as large_farmer_count
+            select stat_year,
+                   stat_month,
+                   village_dept_id,
+                   max(town_dept_id) as town_dept_id,
+                   max(town_name) as town_name,
+                   max(village_name) as village_name,
+                   count(*) as large_farmer_count
             from biz_large_livestock_farmer
             group by stat_year, stat_month, village_dept_id
         ) l
@@ -705,13 +715,14 @@
                 and k.stat_month = #{statMonth}
             </if>
             <if test="townDeptId != null">
-                and coalesce(h.town_dept_id, c.town_dept_id) = #{townDeptId}
+                and coalesce(h.town_dept_id, c.town_dept_id, f.town_dept_id, l.town_dept_id) = #{townDeptId}
             </if>
             <if test="villageDeptId != null">
                 and k.village_dept_id = #{villageDeptId}
             </if>
         </where>
         order by k.stat_year desc, k.stat_month desc,
-                 coalesce(h.town_dept_id, c.town_dept_id) asc, k.village_dept_id asc
+                 coalesce(h.town_dept_id, c.town_dept_id, f.town_dept_id, l.town_dept_id) asc,
+                 k.village_dept_id asc
     </select>
 </mapper>

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

@@ -69,10 +69,12 @@ class HomeScreenStatsMapperXmlTest
         assertTrue(xml.contains("selectBreedingEntityQuantityList"));
         assertTrue(xml.contains("from biz_farmer_household"));
         assertTrue(xml.contains("union"));
-        assertTrue(xml.contains("biz_cooperative_development"));
-        assertTrue(xml.contains("biz_family_ranch"));
-        assertTrue(xml.contains("biz_large_livestock_farmer"));
+        assertTrue(xml.contains("from biz_cooperative_development"));
+        assertTrue(xml.contains("from biz_family_ranch"));
+        assertTrue(xml.contains("from biz_large_livestock_farmer"));
         assertTrue(xml.contains("cooperative_count"));
+        assertTrue(xml.contains("family_ranch_count"));
+        assertTrue(xml.contains("large_farmer_count"));
         assertTrue(xml.contains("herdStatMonth"));
         assertTrue(xml.contains("outboundStatMonth"));
         assertTrue(xml.contains("status not in (2, 3)"));

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

@@ -572,20 +572,20 @@ class HomeScreenServiceImplTest
     }
 
     @Test
-    @DisplayName("DP-SY-UT-040c 仅合作社有数据时仍返回（农牧户等为0）")
-    void ut040c_breedingEntityQuantitiesCooperativeOnly()
-    {
-        HomeScreenBreedingEntityQuantityListItemVo row = new HomeScreenBreedingEntityQuantityListItemVo();
-        row.setStatYear(2026);
-        row.setStatMonth(5);
-        row.setTownName("巴青乡");
-        row.setVillageName("1村");
-        row.setFarmerHouseholdCount(0);
-        row.setCooperativeCount(2);
-        row.setFamilyRanchCount(0);
-        row.setLargeLivestockFarmerCount(0);
+    @DisplayName("DP-SY-UT-040c 任一组织形式有数据即可返回（其余为0）")
+    void ut040c_breedingEntityQuantitiesAnyFormOnly()
+    {
+        HomeScreenBreedingEntityQuantityListItemVo coopOnly = new HomeScreenBreedingEntityQuantityListItemVo();
+        coopOnly.setStatYear(2026);
+        coopOnly.setStatMonth(5);
+        coopOnly.setTownName("巴青乡");
+        coopOnly.setVillageName("1村");
+        coopOnly.setFarmerHouseholdCount(0);
+        coopOnly.setCooperativeCount(2);
+        coopOnly.setFamilyRanchCount(0);
+        coopOnly.setLargeLivestockFarmerCount(0);
         when(homeScreenStatsMapper.selectBreedingEntityQuantityList(eq(2026), eq(5), eq(null), eq(null)))
-                .thenReturn(Collections.singletonList(row));
+                .thenReturn(Collections.singletonList(coopOnly));
         List<HomeScreenBreedingEntityQuantityListItemVo> list =
                 service.listBreedingEntityQuantities(2026, 5, null, null);
         assertEquals(1, list.size());

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

@@ -596,11 +596,11 @@
 | `villageDeptId` | long | N | 所属村 |
 | `pageNum` / `pageSize` | int | N | 分页（PageHelper） |
 
-关联：村×年月键集 = `biz_farmer_household` ∪ `biz_cooperative_development`；按 `(stat_year, stat_month, village_dept_id)` 左关联农牧户户数及合作社 / 家庭牧场 / 养殖大户条数（无则 0）。**仅有合作社填报、无农牧户时仍返回该行**，农牧户/家庭牧场/养殖大户为 0。
+关联：村×年月键集 = `biz_farmer_household` ∪ `biz_cooperative_development` ∪ `biz_family_ranch` ∪ `biz_large_livestock_farmer`（以 `(stat_year, stat_month, village_dept_id)` 为键）。合作社/家庭牧场/养殖大户为农牧户不同组织形式；**任一形式有填报即可出列，其余数量为 0**。
 
 排序：`stat_year DESC, stat_month DESC, town_dept_id ASC, village_dept_id ASC`。
 
-性能：键集 UNION + 分组计数 JOIN（走各表村年月唯一/索引）；PageHelper 对结果集分页，支持跨多年全量翻页。
+性能：四表键集 UNION + 分组计数 JOIN（走各表村年月唯一/索引）；PageHelper 对结果集分页，支持跨多年全量翻页。
 
 #### 响应 `rows[]`
 

ruoyi-screen/src/views/home/BreedingEntityQuantityDialog.vue

@@ -46,6 +46,10 @@ const { syncDialogYearFromGlobal } = useDialogStatYearSync(query, {
 
 const monthOptions = Array.from({ length: 12 }, (_, i) => i + 1)
 
+function currentMonth() {
+  return new Date().getMonth() + 1
+}
+
 async function fetchList() {
   loading.value = true
   try {
@@ -79,7 +83,7 @@ function handleSearch() {
 
 function handleReset() {
   syncDialogYearFromGlobal()
-  query.statMonth = undefined
+  query.statMonth = currentMonth()
   query.townDeptId = undefined
   query.villageDeptId = undefined
   pageNum.value = 1
@@ -92,7 +96,7 @@ function onTownChange() {
 
 function onOpen() {
   syncDialogYearFromGlobal()
-  query.statMonth = undefined
+  query.statMonth = currentMonth()
   query.townDeptId = undefined
   query.villageDeptId = undefined
   pageNum.value = 1