畜牧资源

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

@@ -1,5 +1,6 @@
 package com.ruoyi.web.modules.screen.controller;
 
+import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -7,6 +8,11 @@ import org.springframework.web.bind.annotation.RequestParam;
 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.LivestockResourceProductOutputListItemVo;
+import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceThreeAssetsProblemListItemVo;
+import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceVaccinationListItemVo;
+import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceVetCountListItemVo;
 import com.ruoyi.web.modules.screen.service.ILivestockResourceScreenService;
 
 /**
@@ -34,4 +40,79 @@ public class LivestockResourceScreenController extends BaseController
     {
         return success(livestockResourceScreenService.loadDashboard(statYear));
     }
+
+    /**
+     * 三资具体问题上报情况明细（分页）；按上报时间倒序。
+     * <p>
+     * 查询条件：所属年份（可选，默认当前自然年）、所属乡镇、所属村。
+     * 数据源 {@code biz_three_assets_problem_report}。
+     * </p>
+     */
+    @GetMapping("/threeAssetsProblemReports")
+    public TableDataInfo threeAssetsProblemReports(
+            @RequestParam(value = "statYear", required = false) Integer statYear,
+            @RequestParam(value = "townDeptId", required = false) Long townDeptId,
+            @RequestParam(value = "villageDeptId", required = false) Long villageDeptId)
+    {
+        startPage();
+        List<LivestockResourceThreeAssetsProblemListItemVo> list =
+                livestockResourceScreenService.listThreeAssetsProblemReports(statYear, townDeptId, villageDeptId);
+        return getDataTable(list);
+    }
+
+    /**
+     * 畜牧产品产量数据明细（分页）；按所属年月倒序。
+     * <p>
+     * 查询条件：所属年份（可选，默认当前自然年）、所属月份（可选，默认当前自然月）、所属乡镇、所属村。
+     * 数据源 {@code biz_livestock_product_output}。
+     * </p>
+     */
+    @GetMapping("/productOutputs")
+    public TableDataInfo productOutputs(
+            @RequestParam(value = "statYear", required = false) Integer statYear,
+            @RequestParam(value = "statMonth", required = false) Integer statMonth,
+            @RequestParam(value = "townDeptId", required = false) Long townDeptId,
+            @RequestParam(value = "villageDeptId", required = false) Long villageDeptId)
+    {
+        startPage();
+        List<LivestockResourceProductOutputListItemVo> list =
+                livestockResourceScreenService.listProductOutputs(statYear, statMonth, townDeptId, villageDeptId);
+        return getDataTable(list);
+    }
+
+    /**
+     * 疫苗接种情况明细（分页）；按所属年月倒序。
+     * <p>
+     * 查询条件：所属年份（可选，默认当前自然年）、所属月份（可选，默认当前自然月）、所属乡镇、所属村。
+     * 数据源 {@code biz_vaccination_data}。
+     * </p>
+     */
+    @GetMapping("/vaccinationData")
+    public TableDataInfo vaccinationData(
+            @RequestParam(value = "statYear", required = false) Integer statYear,
+            @RequestParam(value = "statMonth", required = false) Integer statMonth,
+            @RequestParam(value = "townDeptId", required = false) Long townDeptId,
+            @RequestParam(value = "villageDeptId", required = false) Long villageDeptId)
+    {
+        startPage();
+        List<LivestockResourceVaccinationListItemVo> list =
+                livestockResourceScreenService.listVaccinationData(statYear, statMonth, townDeptId, villageDeptId);
+        return getDataTable(list);
+    }
+
+    /**
+     * 兽医数量明细（分页）；按乡镇汇总人数。
+     * <p>
+     * 查询条件：所属乡镇（可选）。
+     * 数据源 {@code biz_medical_resource}，口径 {@code resource_type=004001} 且 {@code del_flag=0}。
+     * </p>
+     */
+    @GetMapping("/vetCounts")
+    public TableDataInfo vetCounts(
+            @RequestParam(value = "townDeptId", required = false) Long townDeptId)
+    {
+        startPage();
+        List<LivestockResourceVetCountListItemVo> list = livestockResourceScreenService.listVetCounts(townDeptId);
+        return getDataTable(list);
+    }
 }

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

@@ -0,0 +1,82 @@
+package com.ruoyi.web.modules.screen.domain.vo;
+
+import java.math.BigDecimal;
+
+/**
+ * 大屏畜牧资源 — 畜牧产品产量数据明细行。
+ */
+public class LivestockResourceProductOutputListItemVo
+{
+    /** 所属年份 */
+    private Integer statYear;
+    /** 所属月份 */
+    private Integer statMonth;
+    /** 乡镇名称 */
+    private String townName;
+    /** 村名称 */
+    private String villageName;
+    /** 肉产量（万吨） */
+    private BigDecimal meatOutput;
+    /** 奶产量（万吨） */
+    private BigDecimal milkOutput;
+
+    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 String getTownName()
+    {
+        return townName;
+    }
+
+    public void setTownName(String townName)
+    {
+        this.townName = townName;
+    }
+
+    public String getVillageName()
+    {
+        return villageName;
+    }
+
+    public void setVillageName(String villageName)
+    {
+        this.villageName = villageName;
+    }
+
+    public BigDecimal getMeatOutput()
+    {
+        return meatOutput;
+    }
+
+    public void setMeatOutput(BigDecimal meatOutput)
+    {
+        this.meatOutput = meatOutput;
+    }
+
+    public BigDecimal getMilkOutput()
+    {
+        return milkOutput;
+    }
+
+    public void setMilkOutput(BigDecimal milkOutput)
+    {
+        this.milkOutput = milkOutput;
+    }
+}

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

@@ -0,0 +1,96 @@
+package com.ruoyi.web.modules.screen.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 大屏畜牧资源 — 三资具体问题上报明细行。
+ */
+public class LivestockResourceThreeAssetsProblemListItemVo
+{
+    /** 上报时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date reportTime;
+    /** 乡镇名称 */
+    private String townName;
+    /** 村名称 */
+    private String villageName;
+    /** 问题等级编码：general / key / major */
+    private String problemLevel;
+    /** 问题等级名称：一般 / 重点 / 重大 */
+    private String problemLevelName;
+    /** 问题详细描述 */
+    private String problemDetail;
+    /** 处理结果 */
+    private String handleResult;
+
+    public Date getReportTime()
+    {
+        return reportTime;
+    }
+
+    public void setReportTime(Date reportTime)
+    {
+        this.reportTime = reportTime;
+    }
+
+    public String getTownName()
+    {
+        return townName;
+    }
+
+    public void setTownName(String townName)
+    {
+        this.townName = townName;
+    }
+
+    public String getVillageName()
+    {
+        return villageName;
+    }
+
+    public void setVillageName(String villageName)
+    {
+        this.villageName = villageName;
+    }
+
+    public String getProblemLevel()
+    {
+        return problemLevel;
+    }
+
+    public void setProblemLevel(String problemLevel)
+    {
+        this.problemLevel = problemLevel;
+    }
+
+    public String getProblemLevelName()
+    {
+        return problemLevelName;
+    }
+
+    public void setProblemLevelName(String problemLevelName)
+    {
+        this.problemLevelName = problemLevelName;
+    }
+
+    public String getProblemDetail()
+    {
+        return problemDetail;
+    }
+
+    public void setProblemDetail(String problemDetail)
+    {
+        this.problemDetail = problemDetail;
+    }
+
+    public String getHandleResult()
+    {
+        return handleResult;
+    }
+
+    public void setHandleResult(String handleResult)
+    {
+        this.handleResult = handleResult;
+    }
+}

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

@@ -0,0 +1,94 @@
+package com.ruoyi.web.modules.screen.domain.vo;
+
+import java.math.BigDecimal;
+
+/**
+ * 大屏畜牧资源 — 疫苗接种情况明细行。
+ */
+public class LivestockResourceVaccinationListItemVo
+{
+    /** 所属年份 */
+    private Integer statYear;
+    /** 所属月份 */
+    private Integer statMonth;
+    /** 乡镇名称 */
+    private String townName;
+    /** 村名称 */
+    private String villageName;
+    /** 应免数（头） */
+    private Integer shouldVaccinateCount;
+    /** 实免数（头） */
+    private Integer actualVaccinateCount;
+    /** 免疫率 %，2 位小数 */
+    private BigDecimal immunityRate;
+
+    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 String getTownName()
+    {
+        return townName;
+    }
+
+    public void setTownName(String townName)
+    {
+        this.townName = townName;
+    }
+
+    public String getVillageName()
+    {
+        return villageName;
+    }
+
+    public void setVillageName(String villageName)
+    {
+        this.villageName = villageName;
+    }
+
+    public Integer getShouldVaccinateCount()
+    {
+        return shouldVaccinateCount;
+    }
+
+    public void setShouldVaccinateCount(Integer shouldVaccinateCount)
+    {
+        this.shouldVaccinateCount = shouldVaccinateCount;
+    }
+
+    public Integer getActualVaccinateCount()
+    {
+        return actualVaccinateCount;
+    }
+
+    public void setActualVaccinateCount(Integer actualVaccinateCount)
+    {
+        this.actualVaccinateCount = actualVaccinateCount;
+    }
+
+    public BigDecimal getImmunityRate()
+    {
+        return immunityRate;
+    }
+
+    public void setImmunityRate(BigDecimal immunityRate)
+    {
+        this.immunityRate = immunityRate;
+    }
+}

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

@@ -0,0 +1,32 @@
+package com.ruoyi.web.modules.screen.domain.vo;
+
+/**
+ * 大屏畜牧资源 — 兽医数量明细行（按乡镇汇总）。
+ */
+public class LivestockResourceVetCountListItemVo
+{
+    /** 乡镇名称 */
+    private String townName;
+    /** 兽医数量（人） */
+    private Long vetCount;
+
+    public String getTownName()
+    {
+        return townName;
+    }
+
+    public void setTownName(String townName)
+    {
+        this.townName = townName;
+    }
+
+    public Long getVetCount()
+    {
+        return vetCount;
+    }
+
+    public void setVetCount(Long vetCount)
+    {
+        this.vetCount = vetCount;
+    }
+}

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

@@ -15,6 +15,7 @@ import com.ruoyi.web.modules.screen.domain.dto.LivestockResourceThreeAssetsSumDt
 import com.ruoyi.web.modules.screen.domain.dto.LivestockResourceTechPersonnelDto;
 import com.ruoyi.web.modules.screen.domain.dto.LivestockResourceUserStructureDto;
 import com.ruoyi.web.modules.screen.domain.dto.LivestockResourceVaccinationSumDto;
+import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceVetCountListItemVo;
 
 /**
  * 大屏畜牧资源统计只读 Mapper。
@@ -52,6 +53,12 @@ public interface LivestockResourceScreenMapper
     /** 兽医人员数：resource_type=004001 且未删除 */
     Long countVetMedicalResource();
 
+    /**
+     * 兽医人数按乡镇汇总（resource_type=004001 且未删除）；可选按乡镇筛选。
+     * <p>按部门 order_num、乡镇 ID 升序。</p>
+     */
+    List<LivestockResourceVetCountListItemVo> selectVetCountByTown(@Param("townDeptId") Long townDeptId);
+
     /** 诊疗机构数：resource_type=004003 且未删除 */
     Long countMedicalOrgResource();
 

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

@@ -1,6 +1,11 @@
 package com.ruoyi.web.modules.screen.service;
 
+import java.util.List;
 import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceDashboardVo;
+import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceProductOutputListItemVo;
+import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceThreeAssetsProblemListItemVo;
+import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceVaccinationListItemVo;
+import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceVetCountListItemVo;
 
 /**
  * 大屏畜牧资源统计服务。
@@ -9,4 +14,31 @@ public interface ILivestockResourceScreenService
 {
     /** 畜牧资源看板（产业与培训相关区块；AI 问诊九区块已屏蔽） */
     LivestockResourceDashboardVo loadDashboard(String statYear);
+
+    /**
+     * 三资具体问题上报明细（分页；按上报时间倒序）。
+     * <p>所属年份未传时默认当前自然年；乡镇、村可选。</p>
+     */
+    List<LivestockResourceThreeAssetsProblemListItemVo> listThreeAssetsProblemReports(
+            Integer statYear, Long townDeptId, Long villageDeptId);
+
+    /**
+     * 畜牧产品产量数据明细（分页；按所属年月倒序）。
+     * <p>所属年份/月份未传时默认当前自然年月；乡镇、村可选。</p>
+     */
+    List<LivestockResourceProductOutputListItemVo> listProductOutputs(
+            Integer statYear, Integer statMonth, Long townDeptId, Long villageDeptId);
+
+    /**
+     * 疫苗接种情况明细（分页；按所属年月倒序）。
+     * <p>所属年份/月份未传时默认当前自然年月；乡镇、村可选。</p>
+     */
+    List<LivestockResourceVaccinationListItemVo> listVaccinationData(
+            Integer statYear, Integer statMonth, Long townDeptId, Long villageDeptId);
+
+    /**
+     * 兽医数量明细（分页；按乡镇汇总）。
+     * <p>所属乡镇可选；口径同总览：resource_type=004001 且 del_flag=0。</p>
+     */
+    List<LivestockResourceVetCountListItemVo> listVetCounts(Long townDeptId);
 }

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

@@ -2,10 +2,19 @@ package com.ruoyi.web.modules.screen.service.impl;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.YearMonth;
 import java.time.ZoneId;
+import java.util.Collections;
 import java.util.Date;
+import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import com.ruoyi.web.modules.industryservice.domain.BizLivestockProductOutput;
+import com.ruoyi.web.modules.industryservice.domain.BizThreeAssetsProblemReport;
+import com.ruoyi.web.modules.industryservice.domain.BizVaccinationData;
+import com.ruoyi.web.modules.industryservice.mapper.BizLivestockProductOutputMapper;
+import com.ruoyi.web.modules.industryservice.mapper.BizThreeAssetsProblemReportMapper;
+import com.ruoyi.web.modules.industryservice.mapper.BizVaccinationDataMapper;
 import com.ruoyi.web.modules.industryservice.support.BreedingIndustryRules;
 import com.ruoyi.web.modules.prosperity.support.AchievementReportValidation;
 import com.ruoyi.web.modules.screen.domain.dto.HomeScreenStatPeriodDto;
@@ -15,6 +24,10 @@ import com.ruoyi.web.modules.screen.domain.dto.LivestockResourceThreeAssetsSumDt
 import com.ruoyi.web.modules.screen.domain.dto.LivestockResourceVaccinationSumDto;
 import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceDashboardVo;
 import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceOverviewVo;
+import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceProductOutputListItemVo;
+import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceThreeAssetsProblemListItemVo;
+import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceVaccinationListItemVo;
+import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceVetCountListItemVo;
 import com.ruoyi.web.modules.screen.mapper.HomeScreenStatsMapper;
 import com.ruoyi.web.modules.screen.mapper.LivestockResourceScreenMapper;
 import com.ruoyi.web.modules.screen.service.ILivestockResourceScreenService;
@@ -37,6 +50,15 @@ public class LivestockResourceScreenServiceImpl implements ILivestockResourceScr
     @Autowired
     private HomeScreenStatsMapper homeScreenStatsMapper;
 
+    @Autowired
+    private BizThreeAssetsProblemReportMapper bizThreeAssetsProblemReportMapper;
+
+    @Autowired
+    private BizLivestockProductOutputMapper bizLivestockProductOutputMapper;
+
+    @Autowired
+    private BizVaccinationDataMapper bizVaccinationDataMapper;
+
     @Override
     public LivestockResourceDashboardVo loadDashboard(String statYear)
     {
@@ -90,6 +112,73 @@ public class LivestockResourceScreenServiceImpl implements ILivestockResourceScr
         return vo;
     }
 
+    @Override
+    public List<LivestockResourceThreeAssetsProblemListItemVo> listThreeAssetsProblemReports(
+            Integer statYear, Long townDeptId, Long villageDeptId)
+    {
+        int year = statYear != null ? statYear : HomeScreenSupport.currentYearMonth().getYear();
+        LocalDate yearStart = LocalDate.of(year, 1, 1);
+        LocalDate yearEnd = LocalDate.of(year, 12, 31);
+
+        BizThreeAssetsProblemReport query = new BizThreeAssetsProblemReport();
+        query.setTownDeptId(townDeptId);
+        query.setVillageDeptId(villageDeptId);
+        query.setBeginReportTime(toDate(yearStart));
+        query.setEndReportTime(toDate(yearEnd));
+        // 大屏全县口径，清空 dataScope
+        query.getParams().put("dataScope", "");
+        List<BizThreeAssetsProblemReport> rows =
+                bizThreeAssetsProblemReportMapper.selectBizThreeAssetsProblemReportList(query);
+        return LivestockResourceScreenSupport.buildThreeAssetsProblemListItems(rows);
+    }
+
+    @Override
+    public List<LivestockResourceProductOutputListItemVo> listProductOutputs(
+            Integer statYear, Integer statMonth, Long townDeptId, Long villageDeptId)
+    {
+        YearMonth current = HomeScreenSupport.currentYearMonth();
+        int year = statYear != null ? statYear : current.getYear();
+        int month = statMonth != null ? statMonth : current.getMonthValue();
+
+        BizLivestockProductOutput query = new BizLivestockProductOutput();
+        query.setStatYear(year);
+        query.setStatMonth(month);
+        query.setTownDeptId(townDeptId);
+        query.setVillageDeptId(villageDeptId);
+        // 大屏全县口径，清空 dataScope
+        query.getParams().put("dataScope", "");
+        List<BizLivestockProductOutput> rows =
+                bizLivestockProductOutputMapper.selectBizLivestockProductOutputList(query);
+        return LivestockResourceScreenSupport.buildProductOutputListItems(rows);
+    }
+
+    @Override
+    public List<LivestockResourceVaccinationListItemVo> listVaccinationData(
+            Integer statYear, Integer statMonth, Long townDeptId, Long villageDeptId)
+    {
+        YearMonth current = HomeScreenSupport.currentYearMonth();
+        int year = statYear != null ? statYear : current.getYear();
+        int month = statMonth != null ? statMonth : current.getMonthValue();
+
+        BizVaccinationData query = new BizVaccinationData();
+        query.setStatYear(year);
+        query.setStatMonth(month);
+        query.setTownDeptId(townDeptId);
+        query.setVillageDeptId(villageDeptId);
+        // 大屏全县口径，清空 dataScope
+        query.getParams().put("dataScope", "");
+        List<BizVaccinationData> rows = bizVaccinationDataMapper.selectBizVaccinationDataList(query);
+        return LivestockResourceScreenSupport.buildVaccinationListItems(rows);
+    }
+
+    @Override
+    public List<LivestockResourceVetCountListItemVo> listVetCounts(Long townDeptId)
+    {
+        List<LivestockResourceVetCountListItemVo> rows =
+                livestockResourceScreenMapper.selectVetCountByTown(townDeptId);
+        return rows != null ? rows : Collections.emptyList();
+    }
+
     private LivestockResourceProductOutputSumDto resolveProductOutputSum(int year)
     {
         HomeScreenStatPeriodDto period =

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

@@ -21,6 +21,9 @@ import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import com.ruoyi.web.modules.diagnosis.support.AiConsultConstants;
+import com.ruoyi.web.modules.industryservice.domain.BizLivestockProductOutput;
+import com.ruoyi.web.modules.industryservice.domain.BizThreeAssetsProblemReport;
+import com.ruoyi.web.modules.industryservice.domain.BizVaccinationData;
 import com.ruoyi.web.modules.industryservice.support.BreedingIndustryRules;
 import com.ruoyi.web.modules.screen.domain.dto.LivestockResourceBandCountDto;
 import com.ruoyi.web.modules.screen.domain.dto.LivestockResourceCategoryCountDto;
@@ -43,6 +46,7 @@ import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceKeywordVo;
 import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceOverviewVo;
 import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceProblemLevelItemVo;
 import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceProblemReportShareVo;
+import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceProductOutputListItemVo;
 import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceProductOutputMonthPointVo;
 import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceProductOutputTrendVo;
 import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceReplyStatusVo;
@@ -51,7 +55,9 @@ import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceSessionBandVo;
 import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceShareItemVo;
 import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceStatusItemVo;
 import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceTechEnvoyStructureVo;
+import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceThreeAssetsProblemListItemVo;
 import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceUserStructureVo;
+import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceVaccinationListItemVo;
 import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceVaccinationOverviewVo;
 
 /**
@@ -194,6 +200,124 @@ public final class LivestockResourceScreenSupport
         return vo;
     }
 
+    /** 三资具体问题上报明细分页行 */
+    public static List<LivestockResourceThreeAssetsProblemListItemVo> buildThreeAssetsProblemListItems(
+            List<BizThreeAssetsProblemReport> rows)
+    {
+        if (rows == null || rows.isEmpty())
+        {
+            return Collections.emptyList();
+        }
+        List<LivestockResourceThreeAssetsProblemListItemVo> result = new ArrayList<>(rows.size());
+        for (BizThreeAssetsProblemReport row : rows)
+        {
+            if (row == null)
+            {
+                continue;
+            }
+            LivestockResourceThreeAssetsProblemListItemVo item = new LivestockResourceThreeAssetsProblemListItemVo();
+            item.setReportTime(row.getReportTime());
+            item.setTownName(row.getTownName());
+            item.setVillageName(row.getVillageName());
+            item.setProblemLevel(row.getProblemLevel());
+            item.setProblemLevelName(resolveProblemLevelName(row.getProblemLevel()));
+            item.setProblemDetail(row.getProblemDetail());
+            item.setHandleResult(row.getHandleResult());
+            result.add(item);
+        }
+        return result;
+    }
+
+    public static String resolveProblemLevelName(String levelCode)
+    {
+        if (LivestockResourceScreenRules.PROBLEM_LEVEL_GENERAL.equals(levelCode))
+        {
+            return "一般";
+        }
+        if (LivestockResourceScreenRules.PROBLEM_LEVEL_KEY.equals(levelCode))
+        {
+            return "重点";
+        }
+        if (LivestockResourceScreenRules.PROBLEM_LEVEL_MAJOR.equals(levelCode))
+        {
+            return "重大";
+        }
+        return levelCode;
+    }
+
+    /** 畜牧产品产量明细分页行 */
+    public static List<LivestockResourceProductOutputListItemVo> buildProductOutputListItems(
+            List<BizLivestockProductOutput> rows)
+    {
+        if (rows == null || rows.isEmpty())
+        {
+            return Collections.emptyList();
+        }
+        List<LivestockResourceProductOutputListItemVo> result = new ArrayList<>(rows.size());
+        for (BizLivestockProductOutput row : rows)
+        {
+            if (row == null)
+            {
+                continue;
+            }
+            LivestockResourceProductOutputListItemVo item = new LivestockResourceProductOutputListItemVo();
+            item.setStatYear(row.getStatYear());
+            item.setStatMonth(row.getStatMonth());
+            item.setTownName(row.getTownName());
+            item.setVillageName(row.getVillageName());
+            item.setMeatOutput(scaleOutput(row.getMeatOutput()));
+            item.setMilkOutput(scaleOutput(row.getMilkOutput()));
+            result.add(item);
+        }
+        return result;
+    }
+
+    /** 疫苗接种情况明细分页行 */
+    public static List<LivestockResourceVaccinationListItemVo> buildVaccinationListItems(
+            List<BizVaccinationData> rows)
+    {
+        if (rows == null || rows.isEmpty())
+        {
+            return Collections.emptyList();
+        }
+        List<LivestockResourceVaccinationListItemVo> result = new ArrayList<>(rows.size());
+        for (BizVaccinationData row : rows)
+        {
+            if (row == null)
+            {
+                continue;
+            }
+            LivestockResourceVaccinationListItemVo item = new LivestockResourceVaccinationListItemVo();
+            item.setStatYear(row.getStatYear());
+            item.setStatMonth(row.getStatMonth());
+            item.setTownName(row.getTownName());
+            item.setVillageName(row.getVillageName());
+            item.setShouldVaccinateCount(row.getShouldVaccinateCount());
+            item.setActualVaccinateCount(row.getActualVaccinateCount());
+            item.setImmunityRate(resolveRowImmunityRate(row));
+            result.add(item);
+        }
+        return result;
+    }
+
+    /** 单行免疫率：优先用落库值；为空则按应免/实免重算（应免≤0 时 0.00） */
+    public static BigDecimal resolveRowImmunityRate(BizVaccinationData row)
+    {
+        if (row != null && row.getImmunityRate() != null)
+        {
+            return row.getImmunityRate().setScale(2, RoundingMode.HALF_UP);
+        }
+        int should = row != null && row.getShouldVaccinateCount() != null ? row.getShouldVaccinateCount() : 0;
+        int actual = row != null && row.getActualVaccinateCount() != null ? row.getActualVaccinateCount() : 0;
+        if (should <= 0)
+        {
+            return BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP);
+        }
+        return BigDecimal.valueOf(actual)
+                .multiply(BigDecimal.valueOf(100))
+                .divide(BigDecimal.valueOf(should), 2, RoundingMode.HALF_UP);
+    }
+
     /** 畜牧产品产量：1～maxMonth 肉/奶对比；无最大月则空序列 */
     public static LivestockResourceProductOutputTrendVo buildProductOutputTrend(
             Integer maxMonth, List<LivestockResourceProductOutputMonthDto> rows)

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

@@ -96,6 +96,21 @@
           and del_flag = '0'
     </select>
 
+    <select id="selectVetCountByTown"
+            resultType="com.ruoyi.web.modules.screen.domain.vo.LivestockResourceVetCountListItemVo">
+        select r.town_name as townName,
+               count(1) as vetCount
+        from biz_medical_resource r
+        left join sys_dept d on r.town_dept_id = d.dept_id
+        where r.resource_type = '004001'
+          and r.del_flag = '0'
+        <if test="townDeptId != null">
+            and r.town_dept_id = #{townDeptId}
+        </if>
+        group by r.town_dept_id, r.town_name, d.order_num
+        order by ifnull(d.order_num, 999999) asc, r.town_dept_id asc
+    </select>
+
     <select id="countMedicalOrgResource" resultType="long">
         select count(1)
         from biz_medical_resource

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

@@ -1,5 +1,6 @@
 package com.ruoyi.web.modules.screen.controller;
 
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
@@ -7,6 +8,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 
 import java.math.BigDecimal;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 import org.junit.jupiter.api.AfterEach;
@@ -23,11 +25,16 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import com.github.pagehelper.PageHelper;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceDashboardVo;
 import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceOverviewVo;
+import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceProductOutputListItemVo;
+import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceThreeAssetsProblemListItemVo;
+import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceVaccinationListItemVo;
+import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceVetCountListItemVo;
 import com.ruoyi.web.modules.screen.service.ILivestockResourceScreenService;
 
 /**
@@ -57,6 +64,7 @@ class LivestockResourceScreenControllerApiTest
     void tearDown()
     {
         SecurityContextHolder.clearContext();
+        PageHelper.clearPage();
     }
 
     @Test
@@ -73,6 +81,111 @@ class LivestockResourceScreenControllerApiTest
                 .andExpect(jsonPath("$.data.overview.vetCount").value(15));
     }
 
+    @Test
+    @DisplayName("DP-XM-API-025 GET threeAssetsProblemReports 明细分页")
+    void api025_threeAssetsProblemReports() throws Exception
+    {
+        LivestockResourceThreeAssetsProblemListItemVo item = new LivestockResourceThreeAssetsProblemListItemVo();
+        item.setTownName("巴青镇");
+        item.setVillageName("某村");
+        item.setProblemLevel("general");
+        item.setProblemLevelName("一般");
+        item.setProblemDetail("描述");
+        item.setHandleResult("处理中");
+        when(livestockResourceScreenService.listThreeAssetsProblemReports(eq(2026), eq(101L), eq(201L)))
+                .thenReturn(Collections.singletonList(item));
+        mockMvc.perform(get("/bigScreen/livestockResource/threeAssetsProblemReports")
+                        .param("statYear", "2026")
+                        .param("townDeptId", "101")
+                        .param("villageDeptId", "201")
+                        .param("pageNum", "1")
+                        .param("pageSize", "10"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(200))
+                .andExpect(jsonPath("$.rows[0].townName").value("巴青镇"))
+                .andExpect(jsonPath("$.rows[0].problemLevelName").value("一般"))
+                .andExpect(jsonPath("$.rows[0].problemDetail").value("描述"));
+    }
+
+    @Test
+    @DisplayName("DP-XM-API-026 GET productOutputs 明细分页")
+    void api026_productOutputs() throws Exception
+    {
+        LivestockResourceProductOutputListItemVo item = new LivestockResourceProductOutputListItemVo();
+        item.setStatYear(2026);
+        item.setStatMonth(7);
+        item.setTownName("巴青镇");
+        item.setVillageName("某村");
+        item.setMeatOutput(new BigDecimal("1.2000"));
+        item.setMilkOutput(new BigDecimal("3.4000"));
+        when(livestockResourceScreenService.listProductOutputs(eq(2026), eq(7), eq(101L), eq(201L)))
+                .thenReturn(Collections.singletonList(item));
+        mockMvc.perform(get("/bigScreen/livestockResource/productOutputs")
+                        .param("statYear", "2026")
+                        .param("statMonth", "7")
+                        .param("townDeptId", "101")
+                        .param("villageDeptId", "201")
+                        .param("pageNum", "1")
+                        .param("pageSize", "10"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(200))
+                .andExpect(jsonPath("$.rows[0].statYear").value(2026))
+                .andExpect(jsonPath("$.rows[0].statMonth").value(7))
+                .andExpect(jsonPath("$.rows[0].townName").value("巴青镇"))
+                .andExpect(jsonPath("$.rows[0].meatOutput").value(1.2))
+                .andExpect(jsonPath("$.rows[0].milkOutput").value(3.4));
+    }
+
+    @Test
+    @DisplayName("DP-XM-API-027 GET vaccinationData 明细分页")
+    void api027_vaccinationData() throws Exception
+    {
+        LivestockResourceVaccinationListItemVo item = new LivestockResourceVaccinationListItemVo();
+        item.setStatYear(2026);
+        item.setStatMonth(7);
+        item.setTownName("巴青镇");
+        item.setVillageName("某村");
+        item.setShouldVaccinateCount(100);
+        item.setActualVaccinateCount(80);
+        item.setImmunityRate(new BigDecimal("80.00"));
+        when(livestockResourceScreenService.listVaccinationData(eq(2026), eq(7), eq(101L), eq(201L)))
+                .thenReturn(Collections.singletonList(item));
+        mockMvc.perform(get("/bigScreen/livestockResource/vaccinationData")
+                        .param("statYear", "2026")
+                        .param("statMonth", "7")
+                        .param("townDeptId", "101")
+                        .param("villageDeptId", "201")
+                        .param("pageNum", "1")
+                        .param("pageSize", "10"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(200))
+                .andExpect(jsonPath("$.rows[0].statYear").value(2026))
+                .andExpect(jsonPath("$.rows[0].statMonth").value(7))
+                .andExpect(jsonPath("$.rows[0].townName").value("巴青镇"))
+                .andExpect(jsonPath("$.rows[0].shouldVaccinateCount").value(100))
+                .andExpect(jsonPath("$.rows[0].actualVaccinateCount").value(80))
+                .andExpect(jsonPath("$.rows[0].immunityRate").value(80.0));
+    }
+
+    @Test
+    @DisplayName("DP-XM-API-028 GET vetCounts 按乡镇汇总")
+    void api028_vetCounts() throws Exception
+    {
+        LivestockResourceVetCountListItemVo item = new LivestockResourceVetCountListItemVo();
+        item.setTownName("巴青镇");
+        item.setVetCount(15L);
+        when(livestockResourceScreenService.listVetCounts(eq(101L)))
+                .thenReturn(Collections.singletonList(item));
+        mockMvc.perform(get("/bigScreen/livestockResource/vetCounts")
+                        .param("townDeptId", "101")
+                        .param("pageNum", "1")
+                        .param("pageSize", "10"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.code").value(200))
+                .andExpect(jsonPath("$.rows[0].townName").value("巴青镇"))
+                .andExpect(jsonPath("$.rows[0].vetCount").value(15));
+    }
+
     @Test
     @DisplayName("DP-XM-API-024 statYear 回显")
     void api024_statYearEcho() throws Exception

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

@@ -16,12 +16,22 @@ import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+import com.ruoyi.web.modules.industryservice.domain.BizLivestockProductOutput;
+import com.ruoyi.web.modules.industryservice.domain.BizThreeAssetsProblemReport;
+import com.ruoyi.web.modules.industryservice.domain.BizVaccinationData;
+import com.ruoyi.web.modules.industryservice.mapper.BizLivestockProductOutputMapper;
+import com.ruoyi.web.modules.industryservice.mapper.BizThreeAssetsProblemReportMapper;
+import com.ruoyi.web.modules.industryservice.mapper.BizVaccinationDataMapper;
 import com.ruoyi.web.modules.screen.domain.dto.HomeScreenStatPeriodDto;
 import com.ruoyi.web.modules.screen.domain.dto.LivestockResourceProductOutputSumDto;
 import com.ruoyi.web.modules.screen.domain.dto.LivestockResourceTechPersonnelDto;
 import com.ruoyi.web.modules.screen.domain.dto.LivestockResourceThreeAssetsSumDto;
 import com.ruoyi.web.modules.screen.domain.dto.LivestockResourceVaccinationSumDto;
 import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceDashboardVo;
+import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceProductOutputListItemVo;
+import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceThreeAssetsProblemListItemVo;
+import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceVaccinationListItemVo;
+import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceVetCountListItemVo;
 import com.ruoyi.web.modules.screen.mapper.HomeScreenStatsMapper;
 import com.ruoyi.web.modules.screen.mapper.LivestockResourceScreenMapper;
 
@@ -35,6 +45,15 @@ class LivestockResourceScreenServiceImplTest
     @Mock
     private HomeScreenStatsMapper homeScreenStatsMapper;
 
+    @Mock
+    private BizThreeAssetsProblemReportMapper bizThreeAssetsProblemReportMapper;
+
+    @Mock
+    private BizLivestockProductOutputMapper bizLivestockProductOutputMapper;
+
+    @Mock
+    private BizVaccinationDataMapper bizVaccinationDataMapper;
+
     @InjectMocks
     private LivestockResourceScreenServiceImpl service;
 
@@ -159,4 +178,96 @@ class LivestockResourceScreenServiceImplTest
         assertEquals(new BigDecimal("0.00"), vo.getVaccinationOverview().getImmunityRate());
         assertEquals("2020-12-31", vo.getStatDate());
     }
+
+    @Test
+    @DisplayName("三资问题上报明细默认当前年并组装字段")
+    void listThreeAssetsProblemReports()
+    {
+        BizThreeAssetsProblemReport row = new BizThreeAssetsProblemReport();
+        row.setTownName("巴青镇");
+        row.setVillageName("某村");
+        row.setProblemLevel("key");
+        row.setProblemDetail("道路硬化问题");
+        row.setHandleResult("已整改");
+        when(bizThreeAssetsProblemReportMapper.selectBizThreeAssetsProblemReportList(any()))
+                .thenReturn(Collections.singletonList(row));
+
+        java.util.List<LivestockResourceThreeAssetsProblemListItemVo> list =
+                service.listThreeAssetsProblemReports(2026, 101L, 201L);
+        assertEquals(1, list.size());
+        assertEquals("巴青镇", list.get(0).getTownName());
+        assertEquals("某村", list.get(0).getVillageName());
+        assertEquals("key", list.get(0).getProblemLevel());
+        assertEquals("重点", list.get(0).getProblemLevelName());
+        assertEquals("道路硬化问题", list.get(0).getProblemDetail());
+        assertEquals("已整改", list.get(0).getHandleResult());
+    }
+
+    @Test
+    @DisplayName("DP-XM-UT-009 产量明细分页")
+    void listProductOutputs()
+    {
+        BizLivestockProductOutput row = new BizLivestockProductOutput();
+        row.setStatYear(2026);
+        row.setStatMonth(7);
+        row.setTownName("巴青镇");
+        row.setVillageName("某村");
+        row.setMeatOutput(new BigDecimal("1.2"));
+        row.setMilkOutput(new BigDecimal("3.4"));
+        when(bizLivestockProductOutputMapper.selectBizLivestockProductOutputList(any()))
+                .thenReturn(Collections.singletonList(row));
+
+        java.util.List<LivestockResourceProductOutputListItemVo> list =
+                service.listProductOutputs(2026, 7, 101L, 201L);
+        assertEquals(1, list.size());
+        assertEquals(2026, list.get(0).getStatYear());
+        assertEquals(7, list.get(0).getStatMonth());
+        assertEquals("巴青镇", list.get(0).getTownName());
+        assertEquals("某村", list.get(0).getVillageName());
+        assertEquals(new BigDecimal("1.2000"), list.get(0).getMeatOutput());
+        assertEquals(new BigDecimal("3.4000"), list.get(0).getMilkOutput());
+    }
+
+    @Test
+    @DisplayName("DP-XM-UT-010 疫苗接种明细分页")
+    void listVaccinationData()
+    {
+        BizVaccinationData row = new BizVaccinationData();
+        row.setStatYear(2026);
+        row.setStatMonth(7);
+        row.setTownName("巴青镇");
+        row.setVillageName("某村");
+        row.setShouldVaccinateCount(100);
+        row.setActualVaccinateCount(80);
+        row.setImmunityRate(new BigDecimal("80.00"));
+        when(bizVaccinationDataMapper.selectBizVaccinationDataList(any()))
+                .thenReturn(Collections.singletonList(row));
+
+        java.util.List<LivestockResourceVaccinationListItemVo> list =
+                service.listVaccinationData(2026, 7, 101L, 201L);
+        assertEquals(1, list.size());
+        assertEquals(2026, list.get(0).getStatYear());
+        assertEquals(7, list.get(0).getStatMonth());
+        assertEquals("巴青镇", list.get(0).getTownName());
+        assertEquals("某村", list.get(0).getVillageName());
+        assertEquals(100, list.get(0).getShouldVaccinateCount());
+        assertEquals(80, list.get(0).getActualVaccinateCount());
+        assertEquals(new BigDecimal("80.00"), list.get(0).getImmunityRate());
+    }
+
+    @Test
+    @DisplayName("DP-XM-UT-011 兽医数量按乡镇汇总")
+    void listVetCounts()
+    {
+        LivestockResourceVetCountListItemVo row = new LivestockResourceVetCountListItemVo();
+        row.setTownName("巴青镇");
+        row.setVetCount(15L);
+        when(livestockResourceScreenMapper.selectVetCountByTown(eq(101L)))
+                .thenReturn(Collections.singletonList(row));
+
+        java.util.List<LivestockResourceVetCountListItemVo> list = service.listVetCounts(101L);
+        assertEquals(1, list.size());
+        assertEquals("巴青镇", list.get(0).getTownName());
+        assertEquals(15L, list.get(0).getVetCount());
+    }
 }

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

@@ -28,9 +28,12 @@ import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceCategoryShareVo;
 import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceHourlyHeatVo;
 import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceOverviewVo;
 import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceProblemReportShareVo;
+import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceProductOutputListItemVo;
 import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceProductOutputTrendVo;
 import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceReplyStatusVo;
 import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceTechEnvoyStructureVo;
+import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceThreeAssetsProblemListItemVo;
+import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceVaccinationListItemVo;
 import com.ruoyi.web.modules.screen.domain.vo.LivestockResourceVaccinationOverviewVo;
 
 /**
@@ -110,6 +113,51 @@ class LivestockResourceScreenSupportTest
         assertEquals(3, share.getItems().size());
         assertEquals(new BigDecimal("100.0"), share.getItems().get(1).getRatio());
 
+        com.ruoyi.web.modules.industryservice.domain.BizThreeAssetsProblemReport problem =
+                new com.ruoyi.web.modules.industryservice.domain.BizThreeAssetsProblemReport();
+        problem.setTownName("巴青镇");
+        problem.setVillageName("某村");
+        problem.setProblemLevel("major");
+        problem.setProblemDetail("详情");
+        problem.setHandleResult("已处理");
+        LivestockResourceThreeAssetsProblemListItemVo problemItem =
+                LivestockResourceScreenSupport.buildThreeAssetsProblemListItems(
+                        Collections.singletonList(problem)).get(0);
+        assertEquals("巴青镇", problemItem.getTownName());
+        assertEquals("重大", problemItem.getProblemLevelName());
+        assertEquals("详情", problemItem.getProblemDetail());
+
+        com.ruoyi.web.modules.industryservice.domain.BizLivestockProductOutput output =
+                new com.ruoyi.web.modules.industryservice.domain.BizLivestockProductOutput();
+        output.setStatYear(2026);
+        output.setStatMonth(7);
+        output.setTownName("巴青镇");
+        output.setVillageName("某村");
+        output.setMeatOutput(new BigDecimal("1.2"));
+        output.setMilkOutput(new BigDecimal("3.4"));
+        LivestockResourceProductOutputListItemVo outputItem =
+                LivestockResourceScreenSupport.buildProductOutputListItems(
+                        Collections.singletonList(output)).get(0);
+        assertEquals(2026, outputItem.getStatYear());
+        assertEquals(7, outputItem.getStatMonth());
+        assertEquals(new BigDecimal("1.2000"), outputItem.getMeatOutput());
+        assertEquals(new BigDecimal("3.4000"), outputItem.getMilkOutput());
+
+        com.ruoyi.web.modules.industryservice.domain.BizVaccinationData vaccRow =
+                new com.ruoyi.web.modules.industryservice.domain.BizVaccinationData();
+        vaccRow.setStatYear(2026);
+        vaccRow.setStatMonth(7);
+        vaccRow.setTownName("巴青镇");
+        vaccRow.setVillageName("某村");
+        vaccRow.setShouldVaccinateCount(100);
+        vaccRow.setActualVaccinateCount(80);
+        LivestockResourceVaccinationListItemVo vaccItem =
+                LivestockResourceScreenSupport.buildVaccinationListItems(
+                        Collections.singletonList(vaccRow)).get(0);
+        assertEquals(100, vaccItem.getShouldVaccinateCount());
+        assertEquals(80, vaccItem.getActualVaccinateCount());
+        assertEquals(new BigDecimal("80.00"), vaccItem.getImmunityRate());
+
         LivestockResourceProductOutputMonthDto m3 = new LivestockResourceProductOutputMonthDto();
         m3.setStatMonth(3);
         m3.setMeatOutput(new BigDecimal("1"));

doc/大屏/畜牧资源/大屏畜牧资源技术方案.md

@@ -214,9 +214,13 @@ XML：`mapper/screen/LivestockResourceScreenMapper.xml`。
 
 | # | 说明 | Method | URI |
 | --- | --- | --- | --- |
-| 3.1 | 看板主数据（十区块合一） | GET | `/bigScreen/livestockResource/dashboard` |
+| 3.1 | 看板主数据 | GET | `/bigScreen/livestockResource/dashboard` |
+| 3.2 | 三资具体问题上报明细 | GET | `/bigScreen/livestockResource/threeAssetsProblemReports` |
+| 3.3 | 畜牧产品产量数据明细 | GET | `/bigScreen/livestockResource/productOutputs` |
+| 3.4 | 疫苗接种情况明细 | GET | `/bigScreen/livestockResource/vaccinationData` |
+| 3.5 | 兽医数量明细 | GET | `/bigScreen/livestockResource/vetCounts` |
 
-前端：进入页 / 切换 `statYear` / 刷新 → 仅 **3.1**。
+前端：进入页 / 切换 `statYear` / 刷新 → **3.1**；点问题上报区块看明细 → **3.2**；点产量区块看明细 → **3.3**；点疫苗区块看明细 → **3.4**；点兽医指标看明细 → **3.5**。
 
 ---
 
@@ -422,6 +426,125 @@ XML：`mapper/screen/LivestockResourceScreenMapper.xml`。
 
 ---
 
+### 3.2 三资具体问题上报明细
+
+**URI**：`GET /bigScreen/livestockResource/threeAssetsProblemReports`  
+**分页**：若依 `startPage()` / `TableDataInfo`（`pageNum`/`pageSize`）  
+**排序**：`report_time` 倒序（同表既有 list SQL）
+
+#### Query
+
+| 参数 | 类型 | 必填 | 说明 |
+| --- | --- | --- | --- |
+| `statYear` | int | N | 所属年份；未传默认**当前自然年**；按 `report_time` 落在该年 1-1～12-31 |
+| `townDeptId` | long | N | 所属乡镇 |
+| `villageDeptId` | long | N | 所属村 |
+| `pageNum` / `pageSize` | int | N | 分页 |
+
+#### 响应 `rows[]`
+
+| 字段 | 类型 | 说明 |
+| --- | --- | --- |
+| `reportTime` | string | 上报时间 `yyyy-MM-dd HH:mm:ss` |
+| `townName` | string | 乡镇 |
+| `villageName` | string | 村 |
+| `problemLevel` | string | 等级编码 `general`/`key`/`major` |
+| `problemLevelName` | string | 等级名称 一般/重点/重大 |
+| `problemDetail` | string | 问题详细描述 |
+| `handleResult` | string | 处理结果 |
+
+数据源：`biz_three_assets_problem_report`；大屏全县口径（清空 `dataScope`）。
+
+---
+
+### 3.3 畜牧产品产量数据明细
+
+**URI**：`GET /bigScreen/livestockResource/productOutputs`  
+**分页**：若依 `startPage()` / `TableDataInfo`（`pageNum`/`pageSize`）  
+**排序**：`stat_year`、`stat_month` 倒序（同表既有 list SQL）
+
+#### Query
+
+| 参数 | 类型 | 必填 | 说明 |
+| --- | --- | --- | --- |
+| `statYear` | int | N | 所属年份；未传默认**当前自然年** |
+| `statMonth` | int | N | 所属月份；未传默认**当前自然月** |
+| `townDeptId` | long | N | 所属乡镇 |
+| `villageDeptId` | long | N | 所属村 |
+| `pageNum` / `pageSize` | int | N | 分页 |
+
+#### 响应 `rows[]`
+
+| 字段 | 类型 | 说明 |
+| --- | --- | --- |
+| `statYear` | int | 所属年份 |
+| `statMonth` | int | 所属月份 |
+| `townName` | string | 乡镇 |
+| `villageName` | string | 村 |
+| `meatOutput` | number | 肉产量（万吨），4 位小数 |
+| `milkOutput` | number | 奶产量（万吨），4 位小数 |
+
+数据源：`biz_livestock_product_output`；大屏全县口径（清空 `dataScope`）。
+
+---
+
+### 3.4 疫苗接种情况明细
+
+**URI**：`GET /bigScreen/livestockResource/vaccinationData`  
+**分页**：若依 `startPage()` / `TableDataInfo`（`pageNum`/`pageSize`）  
+**排序**：`stat_year`、`stat_month` 倒序（同表既有 list SQL）
+
+#### Query
+
+| 参数 | 类型 | 必填 | 说明 |
+| --- | --- | --- | --- |
+| `statYear` | int | N | 所属年份；未传默认**当前自然年** |
+| `statMonth` | int | N | 所属月份；未传默认**当前自然月** |
+| `townDeptId` | long | N | 所属乡镇 |
+| `villageDeptId` | long | N | 所属村 |
+| `pageNum` / `pageSize` | int | N | 分页 |
+
+#### 响应 `rows[]`
+
+| 字段 | 类型 | 说明 |
+| --- | --- | --- |
+| `statYear` | int | 所属年份 |
+| `statMonth` | int | 所属月份 |
+| `townName` | string | 乡镇 |
+| `villageName` | string | 村 |
+| `shouldVaccinateCount` | int | 应免数（头） |
+| `actualVaccinateCount` | int | 实免数（头） |
+| `immunityRate` | number | 免疫率 %，2 位小数；(实免/应免)×100 |
+
+数据源：`biz_vaccination_data`；大屏全县口径（清空 `dataScope`）。
+
+---
+
+### 3.5 兽医数量明细
+
+**URI**：`GET /bigScreen/livestockResource/vetCounts`  
+**分页**：若依 `startPage()` / `TableDataInfo`（`pageNum`/`pageSize`）  
+**排序**：乡镇部门 `order_num`、`town_dept_id` 升序  
+**粒度**：按乡镇汇总人数（非人员明细行）
+
+#### Query
+
+| 参数 | 类型 | 必填 | 说明 |
+| --- | --- | --- | --- |
+| `townDeptId` | long | N | 所属乡镇 |
+| `pageNum` / `pageSize` | int | N | 分页 |
+
+#### 响应 `rows[]`
+
+| 字段 | 类型 | 说明 |
+| --- | --- | --- |
+| `townName` | string | 乡镇 |
+| `vetCount` | long | 数量（人） |
+
+数据源：`biz_medical_resource`；口径 `resource_type='004001'` 且 `del_flag='0'`（与总览兽医人数一致）。
+
+---
+
 ## 4. 菜单与权限（示例）
 
 | 类型 | 名称 | 权限标识 |
@@ -447,6 +570,10 @@ SQL 示例：`sql/big_screen_livestock_resource_perm.sql`（挂载「大屏」
 
 | 版本 | 日期 | 说明 |
 | --- | --- | --- |
+| 1.15 | 2026-07-24 | 新增兽医数量明细分页接口 `/vetCounts`（按乡镇汇总） |
+| 1.14 | 2026-07-24 | 新增疫苗接种情况明细分页接口 `/vaccinationData` |
+| 1.13 | 2026-07-24 | 新增畜牧产品产量数据明细分页接口 `/productOutputs` |
+| 1.12 | 2026-07-24 | 新增三资具体问题上报明细分页接口 `/threeAssetsProblemReports` |
 | 1.11 | 2026-07-24 | 看板屏蔽 AI 问诊九区块：活跃度/用户结构/分类/模型调用/分时/会话分布/状态/热门/关键词 |
 | 1.10 | 2026-07-24 | 线下服务预约三项汇总改为资源台账：兽医 004001、机构 004003、专家 004005 |
 | 1.9 | 2026-07-24 | 线下服务预约月度改为所选年 1～最大月 |