From 7ea5eece501c98a91555a5358931367e78e9d23b Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期四, 25 五月 2023 15:40:09 +0800
Subject: [PATCH] 11
---
src/main/java/com/example/jz/service/impl/ReportServiceImpl.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/example/jz/service/impl/ReportServiceImpl.java b/src/main/java/com/example/jz/service/impl/ReportServiceImpl.java
index 4d4d53b..3acd551 100644
--- a/src/main/java/com/example/jz/service/impl/ReportServiceImpl.java
+++ b/src/main/java/com/example/jz/service/impl/ReportServiceImpl.java
@@ -18,6 +18,7 @@
import com.example.jz.modle.dto.ReportParamDto;
import com.example.jz.modle.entity.*;
import com.example.jz.modle.vo.ExportExcelReportVo;
+import com.example.jz.modle.vo.NewCauseVo;
import com.example.jz.modle.vo.ReportListVo;
import com.example.jz.modle.vo.ReportVXVO;
import com.example.jz.service.MinIOService;
@@ -269,12 +270,23 @@
ReportVXVO reportVXVO = new ReportVXVO();
Report report = reportDao.selectOne(new LambdaQueryWrapper<Report>().eq(Report::getId, id));
User user = userDao.selectOne(new LambdaQueryWrapper<User>().eq(User::getId, report.getUserId()));
- BeanUtils.copyProperties(reportVXVO, report);
+ BeanUtils.copyProperties(report, reportVXVO);
reportVXVO.setLocation(user.getLocation());
reportVXVO.setWorkingLocation(user.getWorkingLocation());
reportVXVO.setSex(user.getSex());
reportVXVO.setRealName(user.getRealName());
reportVXVO.setUserIdCard(user.getUserIdcard());
+ reportVXVO.setDescription(causeDao.selectOne(new LambdaQueryWrapper<Cause>().eq(Cause::getId, reportDao.selectOne(new LambdaQueryWrapper<Report>().eq(Report::getId, id)).getCauseId())).getName());
return reportVXVO;
}
+
+ @Override
+ public NewCauseVo rejectCauseList(Integer id) {
+ Report report = reportDao.selectOne(new LambdaQueryWrapper<Report>().eq(Report::getId, id));
+ Cause cause = causeDao.selectOne(new LambdaQueryWrapper<Cause>().eq(Cause::getId, report.getCauseId()));
+ NewCauseVo newCauseVo = new NewCauseVo();
+ newCauseVo.setId(cause.getId());
+ newCauseVo.setName(cause.getName());
+ return newCauseVo;
+ }
}
\ No newline at end of file
--
Gitblit v1.8.0