fix: 修复罪犯工作台汇款记录显示问题
- 修复调用错误方法导致的汇款记录为空问题 - 修复金额解析异常(BigDecimal处理小数) - 修改selectRecentRemittanceDetails替代selectRecentRemittances - 优化selectRecentRiskAssessments方法注释
This commit is contained in:
parent
182b7a7b43
commit
984b95b6ed
@ -57,24 +57,30 @@ public interface PrisonDashboardMapper {
|
|||||||
List<Map<String, Object>> selectRecentRemittanceDetails(@Param("prisonerId") Long prisonerId);
|
List<Map<String, Object>> selectRecentRemittanceDetails(@Param("prisonerId") Long prisonerId);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询最近6个月罪犯的奖惩记录
|
* 查询最近6个月罪犯的风险评估记录
|
||||||
*/
|
*/
|
||||||
@Select("""
|
@Select("""
|
||||||
SELECT
|
SELECT
|
||||||
id,
|
id,
|
||||||
occur_date,
|
assessment_date,
|
||||||
type,
|
assessment_type,
|
||||||
category,
|
overall_score,
|
||||||
content
|
risk_level,
|
||||||
FROM prison_rewards_punishments
|
violence_risk,
|
||||||
|
escape_risk,
|
||||||
|
self_harm_risk,
|
||||||
|
mental_state,
|
||||||
|
recommendation,
|
||||||
|
assessor_name
|
||||||
|
FROM prison_risk
|
||||||
WHERE deleted = 0
|
WHERE deleted = 0
|
||||||
AND status = 1
|
AND status = 3
|
||||||
AND prisoner_id = #{prisonerId}
|
AND prisoner_id = #{prisonerId}
|
||||||
AND occur_date >= DATE_SUB(CURDATE(), INTERVAL 6 MONTH)
|
AND assessment_date >= DATE_SUB(CURDATE(), INTERVAL 6 MONTH)
|
||||||
ORDER BY occur_date DESC
|
ORDER BY assessment_date DESC
|
||||||
LIMIT 10
|
LIMIT 10
|
||||||
""")
|
""")
|
||||||
List<Map<String, Object>> selectRecentRewardsPunishments(@Param("prisonerId") Long prisonerId);
|
List<Map<String, Object>> selectRecentRiskAssessments(@Param("prisonerId") Long prisonerId);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询核心指标卡片数据
|
* 查询核心指标卡片数据
|
||||||
|
|||||||
@ -569,8 +569,8 @@ public class PrisonDashboardServiceImpl implements PrisonDashboardService {
|
|||||||
vo.setInterviewRecords(interviewRecords);
|
vo.setInterviewRecords(interviewRecords);
|
||||||
|
|
||||||
// ==================== 构建汇款记录 ====================
|
// ==================== 构建汇款记录 ====================
|
||||||
// 查询最近6个月的汇款记录
|
// 查询最近6个月的汇款记录(详情)
|
||||||
List<Map<String, Object>> remittanceList = dashboardMapper.selectRecentRemittances(prisonerId);
|
List<Map<String, Object>> remittanceList = dashboardMapper.selectRecentRemittanceDetails(prisonerId);
|
||||||
List<PrisonerDashboardStatsRespVO.RemittanceRecord> remittanceRecords = remittanceList.stream()
|
List<PrisonerDashboardStatsRespVO.RemittanceRecord> remittanceRecords = remittanceList.stream()
|
||||||
.map(r -> {
|
.map(r -> {
|
||||||
Object dateObj = r.get("arrive_date");
|
Object dateObj = r.get("arrive_date");
|
||||||
@ -581,7 +581,7 @@ public class PrisonDashboardServiceImpl implements PrisonDashboardService {
|
|||||||
.name(nameObj != null ? nameObj.toString() : "")
|
.name(nameObj != null ? nameObj.toString() : "")
|
||||||
.nameColor("#67c23a")
|
.nameColor("#67c23a")
|
||||||
.category("汇款")
|
.category("汇款")
|
||||||
.amount(amountObj != null ? Integer.parseInt(amountObj.toString()) : 0)
|
.amount(amountObj != null ? new java.math.BigDecimal(amountObj.toString()).intValue() : 0)
|
||||||
.build();
|
.build();
|
||||||
})
|
})
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user