共同富裕

baqing-admin/src/main/java/com/ruoyi/web/modules/prosperity/mapper/BizCommonProsperityProjectMapper.java

@@ -3,6 +3,7 @@ package com.ruoyi.web.modules.prosperity.mapper;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 import com.ruoyi.web.modules.prosperity.domain.BizCommonProsperityProject;
+import com.ruoyi.web.modules.screen.domain.vo.CommonProsperityProjectTypeDetailVo;
 
 /**
  * 共同富裕项目 Mapper
@@ -28,4 +29,12 @@ public interface BizCommonProsperityProjectMapper
      * 大屏：已发布项目的实施年限并集（可选年份下拉）。
      */
     List<String> selectDistinctStatYearsFromPublished();
+
+    /**
+     * 大屏：共富项目分类情况明细（按实施年限聚合类型数量；年份倒序）。
+     *
+     * @param statYear 所属年份（实施年限），必填
+     */
+    List<CommonProsperityProjectTypeDetailVo> selectPublishedTypeDetailsByYear(
+            @Param("statYear") int statYear);
 }

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

@@ -9,13 +9,15 @@ import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.web.modules.screen.domain.vo.CommonProsperityProjectTypeDetailVo;
 import com.ruoyi.web.modules.screen.domain.vo.ScreenProjectListItemVo;
 import com.ruoyi.web.modules.screen.service.ICommonProsperityScreenService;
 
 /**
  * 大屏 — 共同富裕统计（只读）。
  * <p>
- * 提供看板聚合与共富项目分页列表。看板含：成果总览 / 数字赋能、按月趋势图、项目分类饼图。
+ * 提供看板聚合、共富项目分页列表，以及共富项目分类情况明细分页。
+ * 看板含：成果总览 / 数字赋能、按月趋势图、项目分类饼图。
  * </p>
  * <p>
  * 数据来源：{@code biz_common_prosperity_achievement}（成果台账）、
@@ -38,7 +40,7 @@ public class CommonProsperityScreenController extends BaseController
      * <p>
      * 成果：总览 / 数字赋能取所选年<strong>最大统计月</strong>单月值；
      * {@code monthly} 为该年 1～最大月（缺月补 0）。
-     * 项目：仅 {@code publish_status=1} 且实施周期与统计年 Y 有交集。
+     * 项目：仅 {@code publish_status=1} 且实施年限等于统计年 Y。
      * </p>
      *
      * @param statYear 统计年份，如 {@code 2026}
@@ -52,7 +54,7 @@ public class CommonProsperityScreenController extends BaseController
 
     /**
      * 共富项目分页列表（行内含运营图，无单独详情接口）。
-     * <p>筛选口径同看板项目：已发布且实施周期与 {@code statYear} 有交集；配合 PageHelper。</p>
+     * <p>筛选口径同看板项目：已发布且实施年限等于 {@code statYear}；配合 PageHelper。</p>
      *
      * @param statYear 统计年份，如 {@code 2026}
      */
@@ -63,4 +65,23 @@ public class CommonProsperityScreenController extends BaseController
         List<ScreenProjectListItemVo> list = commonProsperityScreenService.listPublishedProjects(statYear);
         return getDataTable(list);
     }
+
+    /**
+     * 共富项目分类情况明细（分页）；按所属年份（实施年限）倒序。
+     * <p>
+     * 数据源 {@code biz_common_prosperity_project}；口径与看板分类一致：
+     * {@code publish_status=1}，按 {@code impl_year}、{@code project_type} 聚合。
+     * </p>
+     *
+     * @param statYear 所属年份；未传默认当前自然年
+     */
+    @GetMapping("/projectTypeDetails")
+    public TableDataInfo projectTypeDetails(
+            @RequestParam(value = "statYear", required = false) Integer statYear)
+    {
+        startPage();
+        List<CommonProsperityProjectTypeDetailVo> list =
+                commonProsperityScreenService.listProjectTypeDetails(statYear);
+        return getDataTable(list);
+    }
 }

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

@@ -0,0 +1,80 @@
+package com.ruoyi.web.modules.screen.domain.vo;
+
+import java.io.Serializable;
+
+/**
+ * 大屏 — 共富项目分类情况明细行。
+ * <p>
+ * 对应 {@code GET /bigScreen/commonProsperity/projectTypeDetails} 的 {@code rows[]}；
+ * 按 {@code impl_year} 聚合已发布项目的类型数量。
+ * </p>
+ */
+public class CommonProsperityProjectTypeDetailVo implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 所属年份（实施年限 impl_year） */
+    private Integer statYear;
+
+    /** 项目总数（个） */
+    private Integer totalCount;
+
+    /** 和美乡村建设项目数（个），project_type=1 */
+    private Integer heMeiVillageCount;
+
+    /** 人居环境整治提升项目数（个），project_type=2 */
+    private Integer habitatImproveCount;
+
+    /** 其他项目投入数（个），project_type=3 */
+    private Integer otherProjectCount;
+
+    public Integer getStatYear()
+    {
+        return statYear;
+    }
+
+    public void setStatYear(Integer statYear)
+    {
+        this.statYear = statYear;
+    }
+
+    public Integer getTotalCount()
+    {
+        return totalCount;
+    }
+
+    public void setTotalCount(Integer totalCount)
+    {
+        this.totalCount = totalCount;
+    }
+
+    public Integer getHeMeiVillageCount()
+    {
+        return heMeiVillageCount;
+    }
+
+    public void setHeMeiVillageCount(Integer heMeiVillageCount)
+    {
+        this.heMeiVillageCount = heMeiVillageCount;
+    }
+
+    public Integer getHabitatImproveCount()
+    {
+        return habitatImproveCount;
+    }
+
+    public void setHabitatImproveCount(Integer habitatImproveCount)
+    {
+        this.habitatImproveCount = habitatImproveCount;
+    }
+
+    public Integer getOtherProjectCount()
+    {
+        return otherProjectCount;
+    }
+
+    public void setOtherProjectCount(Integer otherProjectCount)
+    {
+        this.otherProjectCount = otherProjectCount;
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.ruoyi.web.modules.screen.service;
 
 import java.util.List;
+import com.ruoyi.web.modules.screen.domain.vo.CommonProsperityProjectTypeDetailVo;
 import com.ruoyi.web.modules.screen.domain.vo.CommonProsperityScreenDashboardVo;
 import com.ruoyi.web.modules.screen.domain.vo.ScreenProjectListItemVo;
 
@@ -26,4 +27,11 @@ public interface ICommonProsperityScreenService
      * @param statYear 统计年份（四位）
      */
     List<ScreenProjectListItemVo> listPublishedProjects(String statYear);
+
+    /**
+     * 共富项目分类情况明细（按实施年限聚合各类型数量；分页由 Controller 启 PageHelper）。
+     *
+     * @param statYear 所属年份；{@code null} 时默认当前自然年
+     */
+    List<CommonProsperityProjectTypeDetailVo> listProjectTypeDetails(Integer statYear);
 }

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

@@ -15,10 +15,12 @@ import com.ruoyi.web.modules.prosperity.mapper.BizCommonProsperityProjectMapper;
 import com.ruoyi.web.modules.prosperity.mapper.BizCommonProsperityProjectOpImageMapper;
 import com.ruoyi.web.modules.prosperity.support.AchievementReportAggregator;
 import com.ruoyi.web.modules.prosperity.support.AchievementReportValidation;
+import com.ruoyi.web.modules.screen.domain.vo.CommonProsperityProjectTypeDetailVo;
 import com.ruoyi.web.modules.screen.domain.vo.CommonProsperityScreenDashboardVo;
 import com.ruoyi.web.modules.screen.domain.vo.ScreenProjectListItemVo;
 import com.ruoyi.web.modules.screen.service.ICommonProsperityScreenService;
 import com.ruoyi.web.modules.screen.support.CommonProsperityScreenSupport;
+import com.ruoyi.web.modules.screen.support.HomeScreenSupport;
 
 /**
  * 大屏共同富裕统计服务实现。
@@ -87,6 +89,19 @@ public class CommonProsperityScreenServiceImpl implements ICommonProsperityScree
         return CommonProsperityScreenSupport.toListItems(projects, byProject);
     }
 
+    /**
+     * {@inheritDoc}
+     * <p>口径：{@code publish_status=1}，按 {@code impl_year} 聚合；未传年份默认当前自然年。</p>
+     */
+    @Override
+    public List<CommonProsperityProjectTypeDetailVo> listProjectTypeDetails(Integer statYear)
+    {
+        int year = statYear != null ? statYear : HomeScreenSupport.currentYearMonth().getYear();
+        List<CommonProsperityProjectTypeDetailVo> list =
+                projectMapper.selectPublishedTypeDetailsByYear(year);
+        return list != null ? list : new ArrayList<>();
+    }
+
     /** 大屏已发布项目（实施周期与统计年交集）；Mapper 返回 null 时转空列表 */
     private List<BizCommonProsperityProject> safePublishedForScreen(int statYear)
     {

baqing-admin/src/main/resources/mapper/prosperity/BizCommonProsperityProjectMapper.xml

@@ -132,4 +132,19 @@
           and impl_year is not null
         order by y desc
     </select>
+
+    <!-- 共富项目分类情况明细：按实施年限聚合；与看板一致仅已发布 -->
+    <select id="selectPublishedTypeDetailsByYear"
+            resultType="com.ruoyi.web.modules.screen.domain.vo.CommonProsperityProjectTypeDetailVo">
+        select p.impl_year as statYear,
+               count(*) as totalCount,
+               sum(case when p.project_type = 1 then 1 else 0 end) as heMeiVillageCount,
+               sum(case when p.project_type = 2 then 1 else 0 end) as habitatImproveCount,
+               sum(case when p.project_type = 3 then 1 else 0 end) as otherProjectCount
+        from biz_common_prosperity_project p
+        where p.publish_status = 1
+          and p.impl_year = #{statYear}
+        group by p.impl_year
+        order by p.impl_year desc
+    </select>
 </mapper>

baqing-admin/src/test/java/com/ruoyi/web/modules/prosperity/mapper/BizCommonProsperityProjectMapperScreenXmlTest.java

@@ -24,6 +24,8 @@ class BizCommonProsperityProjectMapperScreenXmlTest
         assertTrue(xml.contains("screenPublishedWhere"));
         assertTrue(xml.contains("publish_status = 1"));
         assertTrue(xml.contains("selectDistinctStatYearsFromPublished"));
+        assertTrue(xml.contains("selectPublishedTypeDetailsByYear"));
+        assertTrue(xml.contains("heMeiVillageCount"));
     }
 
     private static String readMapperXml()

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

@@ -30,6 +30,7 @@ import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.web.modules.prosperity.domain.vo.AchievementAnnualReportVo;
 import com.ruoyi.web.modules.prosperity.support.AchievementReportAggregator;
+import com.ruoyi.web.modules.screen.domain.vo.CommonProsperityProjectTypeDetailVo;
 import com.ruoyi.web.modules.screen.domain.vo.CommonProsperityScreenDashboardVo;
 import com.ruoyi.web.modules.screen.domain.vo.ProjectTypeStatVo;
 import com.ruoyi.web.modules.screen.domain.vo.ScreenProjectListItemVo;
@@ -172,6 +173,39 @@ class CommonProsperityScreenControllerApiTest
                 .andExpect(jsonPath("$.rows").isEmpty());
     }
 
+    @Test
+    @DisplayName("GET projectTypeDetails 分类明细")
+    void api_projectTypeDetails() throws Exception
+    {
+        CommonProsperityProjectTypeDetailVo row = new CommonProsperityProjectTypeDetailVo();
+        row.setStatYear(2026);
+        row.setTotalCount(10);
+        row.setHeMeiVillageCount(4);
+        row.setHabitatImproveCount(3);
+        row.setOtherProjectCount(3);
+        when(commonProsperityScreenService.listProjectTypeDetails(2026))
+                .thenReturn(Collections.singletonList(row));
+        mockMvc.perform(get("/bigScreen/commonProsperity/projectTypeDetails").param("statYear", "2026"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(200))
+                .andExpect(jsonPath("$.rows[0].statYear").value(2026))
+                .andExpect(jsonPath("$.rows[0].totalCount").value(10))
+                .andExpect(jsonPath("$.rows[0].heMeiVillageCount").value(4))
+                .andExpect(jsonPath("$.rows[0].habitatImproveCount").value(3))
+                .andExpect(jsonPath("$.rows[0].otherProjectCount").value(3));
+    }
+
+    @Test
+    @DisplayName("GET projectTypeDetails 缺年份传 null 由服务默认当前年")
+    void api_projectTypeDetails_defaultYear() throws Exception
+    {
+        when(commonProsperityScreenService.listProjectTypeDetails(null)).thenReturn(Collections.emptyList());
+        mockMvc.perform(get("/bigScreen/commonProsperity/projectTypeDetails"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(200))
+                .andExpect(jsonPath("$.rows").isEmpty());
+    }
+
     private static CommonProsperityScreenDashboardVo sampleDashboard(boolean hasAchievement, boolean hasProject)
     {
         AchievementAnnualReportVo achievement = hasAchievement

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

@@ -13,6 +13,7 @@ import static org.mockito.Mockito.when;
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.List;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -24,7 +25,9 @@ import com.ruoyi.web.modules.prosperity.domain.BizCommonProsperityProject;
 import com.ruoyi.web.modules.prosperity.mapper.BizCommonProsperityAchievementMapper;
 import com.ruoyi.web.modules.prosperity.mapper.BizCommonProsperityProjectMapper;
 import com.ruoyi.web.modules.prosperity.mapper.BizCommonProsperityProjectOpImageMapper;
+import com.ruoyi.web.modules.screen.domain.vo.CommonProsperityProjectTypeDetailVo;
 import com.ruoyi.web.modules.screen.domain.vo.CommonProsperityScreenDashboardVo;
+import com.ruoyi.web.modules.screen.support.HomeScreenSupport;
 
 /**
  * DP-GTFY-UT-014、015
@@ -140,6 +143,39 @@ class CommonProsperityScreenServiceImplTest
         verify(opImageMapper).selectByProjectIds(Arrays.asList(9L));
     }
 
+    @Test
+    @DisplayName("分类明细：指定年份调用聚合查询")
+    void listProjectTypeDetails_withYear()
+    {
+        CommonProsperityProjectTypeDetailVo row = new CommonProsperityProjectTypeDetailVo();
+        row.setStatYear(2025);
+        row.setTotalCount(5);
+        row.setHeMeiVillageCount(2);
+        row.setHabitatImproveCount(2);
+        row.setOtherProjectCount(1);
+        when(projectMapper.selectPublishedTypeDetailsByYear(2025)).thenReturn(Collections.singletonList(row));
+
+        List<CommonProsperityProjectTypeDetailVo> list = service.listProjectTypeDetails(2025);
+        assertEquals(1, list.size());
+        assertEquals(2025, list.get(0).getStatYear().intValue());
+        assertEquals(5, list.get(0).getTotalCount().intValue());
+        assertEquals(2, list.get(0).getHeMeiVillageCount().intValue());
+        verify(projectMapper).selectPublishedTypeDetailsByYear(2025);
+    }
+
+    @Test
+    @DisplayName("分类明细：未传年份默认当前自然年")
+    void listProjectTypeDetails_defaultCurrentYear()
+    {
+        int currentYear = HomeScreenSupport.currentYearMonth().getYear();
+        when(projectMapper.selectPublishedTypeDetailsByYear(currentYear)).thenReturn(Collections.emptyList());
+
+        List<CommonProsperityProjectTypeDetailVo> list = service.listProjectTypeDetails(null);
+        assertNotNull(list);
+        assertTrue(list.isEmpty());
+        verify(projectMapper).selectPublishedTypeDetailsByYear(currentYear);
+    }
+
     private static BizCommonProsperityAchievement sampleAchievementRow()
     {
         return sampleAchievementRowForYear(2026, 3);

doc/大屏/共同富裕/大屏共同富裕技术方案.md

@@ -227,6 +227,34 @@
 
 ---
 
+### 3.3 共富项目分类情况明细
+
+#### Query
+
+| 参数 | 类型 | 必填 | 说明 |
+| --- | --- | --- | --- |
+| `statYear` | int | N | 所属年份（实施年限）；**未传默认当前自然年** |
+| `pageNum` | int | N | 默认 `1` |
+| `pageSize` | int | N | 默认若依分页 |
+
+#### 响应
+
+`TableDataInfo`：按 `impl_year` 倒序；口径与看板分类一致（`publish_status=1`）。
+
+#### 3.3.1 `rows[]` 单条
+
+| 字段 | 类型 | 说明 |
+| --- | --- | --- |
+| `statYear` | int | 所属年份（`impl_year`） |
+| `totalCount` | int | 项目总数（个） |
+| `heMeiVillageCount` | int | 和美乡村建设项目数（`project_type=1`） |
+| `habitatImproveCount` | int | 人居环境整治提升项目数（`project_type=2`） |
+| `otherProjectCount` | int | 其他项目投入数（`project_type=3`） |
+
+`GET /bigScreen/commonProsperity/projectTypeDetails`
+
+---
+
 ## 4. 菜单与权限（示例）
 
 | 类型 | 名称 | 权限标识 | 说明 |
@@ -258,3 +286,4 @@ SQL 示例：`sql/big_screen_common_prosperity_perm.sql`（挂载「大屏」父
 | 1.1 | 2026-07-24 | 看板 `monthly` 改回所选年 1～12 月（与 `summary` 同源），不再覆盖为滚动 12 月 |
 | 1.2 | 2026-07-24 | 看板 `summary` 改为所选年**最大统计月**单月值；`monthly` 仍为该年 1～12 月 |
 | 1.3 | 2026-07-24 | `monthly` 改为所选年 1～最大月；与管理端年度报告共用 Aggregator 口径 |
+| 1.4 | 2026-07-24 | 新增共富项目分类情况明细 `GET /projectTypeDetails`（分页、按年聚合） |