From 984b95b6ed19c05eace112a601abff245043b557 Mon Sep 17 00:00:00 2001
From: tangweijie <877588133@qq.com>
Date: Tue, 27 Jan 2026 14:55:56 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BD=AA=E7=8A=AF?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=B1=87=E6=AC=BE=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修复调用错误方法导致的汇款记录为空问题
- 修复金额解析异常（BigDecimal处理小数）
- 修改selectRecentRemittanceDetails替代selectRecentRemittances
- 优化selectRecentRiskAssessments方法注释
---
 .../dashboard/PrisonDashboardMapper.java      | 26 ++++++++++++-------
 .../impl/PrisonDashboardServiceImpl.java      |  6 ++---
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/dal/mysql/dashboard/PrisonDashboardMapper.java b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/dal/mysql/dashboard/PrisonDashboardMapper.java
index c7dd277b7d..10a0c36772 100644
--- a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/dal/mysql/dashboard/PrisonDashboardMapper.java
+++ b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/dal/mysql/dashboard/PrisonDashboardMapper.java
@@ -57,24 +57,30 @@ public interface PrisonDashboardMapper {
     List<Map<String, Object>> selectRecentRemittanceDetails(@Param("prisonerId") Long prisonerId);
 
     /**
-     * 查询最近6个月罪犯的奖惩记录
+     * 查询最近6个月罪犯的风险评估记录
      */
     @Select("""
         SELECT
             id,
-            occur_date,
-            type,
-            category,
-            content
-        FROM prison_rewards_punishments
+            assessment_date,
+            assessment_type,
+            overall_score,
+            risk_level,
+            violence_risk,
+            escape_risk,
+            self_harm_risk,
+            mental_state,
+            recommendation,
+            assessor_name
+        FROM prison_risk
         WHERE deleted = 0
-        AND status = 1
+        AND status = 3
         AND prisoner_id = #{prisonerId}
-        AND occur_date >= DATE_SUB(CURDATE(), INTERVAL 6 MONTH)
-        ORDER BY occur_date DESC
+        AND assessment_date >= DATE_SUB(CURDATE(), INTERVAL 6 MONTH)
+        ORDER BY assessment_date DESC
         LIMIT 10
         """)
-    List<Map<String, Object>> selectRecentRewardsPunishments(@Param("prisonerId") Long prisonerId);
+    List<Map<String, Object>> selectRecentRiskAssessments(@Param("prisonerId") Long prisonerId);
 
     /**
      * 查询核心指标卡片数据
diff --git a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/service/dashboard/impl/PrisonDashboardServiceImpl.java b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/service/dashboard/impl/PrisonDashboardServiceImpl.java
index 135f7befb3..369e2753ce 100644
--- a/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/service/dashboard/impl/PrisonDashboardServiceImpl.java
+++ b/yudao-module-prison/src/main/java/cn/iocoder/yudao/module/prison/service/dashboard/impl/PrisonDashboardServiceImpl.java
@@ -569,8 +569,8 @@ public class PrisonDashboardServiceImpl implements PrisonDashboardService {
         vo.setInterviewRecords(interviewRecords);
 
         // ==================== 构建汇款记录 ====================
-        // 查询最近6个月的汇款记录
-        List<Map<String, Object>> remittanceList = dashboardMapper.selectRecentRemittances(prisonerId);
+        // 查询最近6个月的汇款记录（详情）
+        List<Map<String, Object>> remittanceList = dashboardMapper.selectRecentRemittanceDetails(prisonerId);
         List<PrisonerDashboardStatsRespVO.RemittanceRecord> remittanceRecords = remittanceList.stream()
                 .map(r -> {
                     Object dateObj = r.get("arrive_date");
@@ -581,7 +581,7 @@ public class PrisonDashboardServiceImpl implements PrisonDashboardService {
                             .name(nameObj != null ? nameObj.toString() : "")
                             .nameColor("#67c23a")
                             .category("汇款")
-                            .amount(amountObj != null ? Integer.parseInt(amountObj.toString()) : 0)
+                            .amount(amountObj != null ? new java.math.BigDecimal(amountObj.toString()).intValue() : 0)
                             .build();
                 })
                 .collect(Collectors.toList());