From 34585765970418096cd642d85950b43382a58327 Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期三, 22 三月 2023 11:25:15 +0800
Subject: [PATCH] 1111
---
src/main/java/com/example/jz/service/ReportService.java | 3 +++
src/main/java/com/example/jz/controller/ReportController.java | 8 ++++++++
src/main/java/com/example/jz/controller/CauseController.java | 2 +-
src/main/java/com/example/jz/controller/WxAppController.java | 23 +++++++++++++++++++++++
src/main/java/com/example/jz/service/impl/ReportServiceImpl.java | 11 +++++++++++
5 files changed, 46 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/example/jz/controller/CauseController.java b/src/main/java/com/example/jz/controller/CauseController.java
index cdf47b2..403d41a 100644
--- a/src/main/java/com/example/jz/controller/CauseController.java
+++ b/src/main/java/com/example/jz/controller/CauseController.java
@@ -90,7 +90,7 @@
@GetMapping("/getVxCauseList")
@ApiOperation(httpMethod = "GET", value = "寰俊鎵炬浠�")
- public R getVxCauseList(@RequestParam String phone){
+ public R<List<NewCauseVo>> getVxCauseList(@RequestParam String phone){
List<NewCauseVo> res = causeService.getVxCauseList(phone);
return R.ok(res);
}
diff --git a/src/main/java/com/example/jz/controller/ReportController.java b/src/main/java/com/example/jz/controller/ReportController.java
index 885cf77..46f65f9 100644
--- a/src/main/java/com/example/jz/controller/ReportController.java
+++ b/src/main/java/com/example/jz/controller/ReportController.java
@@ -13,6 +13,7 @@
import com.example.jz.modle.entity.Message;
import com.example.jz.modle.entity.Report;
import com.example.jz.modle.entity.User;
+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.GroupUserService;
@@ -87,6 +88,13 @@
return R.ok(res);
}
+ @GetMapping("/rejectCauseList")
+ public R<NewCauseVo> rejectCauseList(@RequestParam Integer id){
+ NewCauseVo res = reportService.rejectCauseList(id);
+ return R.ok(res);
+ }
+
+
/**
* 鎶ユ
*
diff --git a/src/main/java/com/example/jz/controller/WxAppController.java b/src/main/java/com/example/jz/controller/WxAppController.java
index 4b1bc9a..1a8fae5 100644
--- a/src/main/java/com/example/jz/controller/WxAppController.java
+++ b/src/main/java/com/example/jz/controller/WxAppController.java
@@ -263,6 +263,29 @@
return R.ok(reportService.save(report));
}
+ @PutMapping ("/user/addReport")
+ public R addReport1(@RequestBody ReportVXVO reportVXVO) {
+ User user = userService.getOne(new QueryWrapper<User>().eq("id", reportVXVO.getUserId()));
+ user.setRealName(reportVXVO.getRealName());
+ user.setSex(reportVXVO.getSex());
+ user.setUserIdcard(reportVXVO.getUserIdCard());
+ user.setLocation(reportVXVO.getLocation());
+ user.setWorkingLocation(reportVXVO.getWorkingLocation());
+
+ userService.update(user, new LambdaQueryWrapper<User>().eq(User::getId, user.getId()));
+ Report report = new Report();
+ BeanUtils.copyProperties(reportVXVO, report);
+ report.setAmountInvolved(reportVXVO.getAmountInvolved());
+ report.setPic(user.getPic());
+ report.setIsInGroup(0);
+ report.setCtime(new Date());
+ report.setStatus(0);
+ report.setReportMethod("鎵爜鎶ユ");
+
+ reportService.update(report, new LambdaQueryWrapper<Report>().eq(Report::getId, report.getId()));
+ return R.ok("淇敼鎴愬姛");
+ }
+
@PostMapping("/user/add")
public R addUser(@RequestBody User user) {
user.setUserLasttime(new Date());
diff --git a/src/main/java/com/example/jz/service/ReportService.java b/src/main/java/com/example/jz/service/ReportService.java
index 571f224..81a8184 100644
--- a/src/main/java/com/example/jz/service/ReportService.java
+++ b/src/main/java/com/example/jz/service/ReportService.java
@@ -5,6 +5,7 @@
import com.example.jz.modle.dto.AddReportDto;
import com.example.jz.modle.dto.ReportParamDto;
import com.example.jz.modle.entity.Report;
+import com.example.jz.modle.vo.NewCauseVo;
import com.example.jz.modle.vo.ReportListVo;
import com.example.jz.modle.vo.ReportVXVO;
import org.springframework.web.multipart.MultipartFile;
@@ -48,5 +49,7 @@
Boolean reject(Integer id, String reason);
ReportVXVO getRejectReportById(Integer id);
+
+ NewCauseVo rejectCauseList(Integer id);
}
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 2ab9bbd..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;
@@ -278,4 +279,14 @@
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