From 5ea0d97a1bf9030945fab70cd8e21aa6e98c7950 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 24 一月 2026 09:35:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordServiceImpl.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordServiceImpl.java
index 278922e..dca8ae0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/RecordServiceImpl.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.mapper.RecordImageMapper;
import com.ruoyi.system.mapper.RecordMapper;
+import com.ruoyi.system.model.ErrorReview;
import com.ruoyi.system.model.Record;
import com.ruoyi.system.model.RecordImage;
import com.ruoyi.system.model.UserFile;
@@ -70,9 +71,14 @@
}
@Override
- public ProblemVo getHiddenDangerDetail(Integer problemId) {
+ public ProblemVo getHiddenDangerDetail(Integer id) {
+ // 根据id找到记录
+ Record record = baseMapper.selectById(id);
// 直接查询并返回，让前端处理JSON字符串解析
- ProblemVo hiddenDangerDetail = baseMapper.getHiddenDangerDetail(problemId);
+ ProblemVo hiddenDangerDetail = baseMapper.getHiddenDangerDetail(record.getProblemId());
+ String projectName =baseMapper.getProjectName(record.getCheckTaskId());
+ hiddenDangerDetail.setProjectName(projectName);
+
if(hiddenDangerDetail!=null){
if (hiddenDangerDetail.getSpecificTermsStr()!=null && !hiddenDangerDetail.getSpecificTermsStr().isEmpty()) {
String specificTermsStr = hiddenDangerDetail.getSpecificTermsStr();
@@ -89,6 +95,17 @@
hiddenDangerDetail.setNumberFactors(JSON.parseArray(numberFactorsStr, String.class));
}
}
+ Integer errorReviewId = record.getErrorReviewId();
+ if(errorReviewId!=null){
+ ErrorReview errorReview = baseMapper.getErrorReview(errorReviewId);
+ if(errorReview!=null){
+ // 查询图片
+ List<String> img = baseMapper.findReviewImg(errorReviewId);
+ errorReview.setImg(img);
+ hiddenDangerDetail.setErrorReview(errorReview);
+ }
+ }
+
return hiddenDangerDetail;
}
}
--
Gitblit v1.7.1