From 75591d24b70c37c5325f88b0f26888056eb2f20d Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期二, 21 三月 2023 16:02:46 +0800
Subject: [PATCH] 提交
---
src/main/java/com/example/jz/service/ReportService.java | 2
src/main/java/com/example/jz/controller/ReportController.java | 12 ++--
src/main/java/com/example/jz/controller/WxAppController.java | 3
src/main/java/com/example/jz/service/impl/ReportServiceImpl.java | 112 +++++++++++++++++++------------------
4 files changed, 67 insertions(+), 62 deletions(-)
diff --git a/src/main/java/com/example/jz/controller/ReportController.java b/src/main/java/com/example/jz/controller/ReportController.java
index c1a83b7..885cf77 100644
--- a/src/main/java/com/example/jz/controller/ReportController.java
+++ b/src/main/java/com/example/jz/controller/ReportController.java
@@ -172,11 +172,11 @@
return R.ok();
}
- @ApiOperation(httpMethod = "POST", value = "妗堜欢鍙�-鎶ユ浜哄憳-鎶ユ鏉愭枡瀵煎嚭")
- @PostMapping("/exportReporter")
- @ApiResponse(message = "鎵ц鎴愬姛", code = 200)
- public void exportReport(@RequestParam(value = "id") Integer id, HttpServletResponse response) {
- reportService.exportReporter(id, response);
- }
+// @ApiOperation(httpMethod = "POST", value = "妗堜欢鍙�-鎶ユ浜哄憳-鎶ユ鏉愭枡瀵煎嚭")
+// @PostMapping("/exportReporter")
+// @ApiResponse(message = "鎵ц鎴愬姛", code = 200)
+// public void exportReport(@RequestParam(value = "id") Integer id, HttpServletResponse response) {
+// reportService.exportReporter(id, response);
+// }
}
diff --git a/src/main/java/com/example/jz/controller/WxAppController.java b/src/main/java/com/example/jz/controller/WxAppController.java
index 4c95a1b..4b1bc9a 100644
--- a/src/main/java/com/example/jz/controller/WxAppController.java
+++ b/src/main/java/com/example/jz/controller/WxAppController.java
@@ -246,10 +246,11 @@
public R addReport(@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.setSex(reportVXVO.getSex());
user.setWorkingLocation(reportVXVO.getWorkingLocation());
+
userService.update(user, new LambdaQueryWrapper<User>().eq(User::getId, user.getId()));
Report report = new Report();
BeanUtils.copyProperties(reportVXVO, report);
diff --git a/src/main/java/com/example/jz/service/ReportService.java b/src/main/java/com/example/jz/service/ReportService.java
index ae836cb..571f224 100644
--- a/src/main/java/com/example/jz/service/ReportService.java
+++ b/src/main/java/com/example/jz/service/ReportService.java
@@ -25,7 +25,7 @@
void leaveGroup(Integer id, Integer groupId);
- void exportReporter(Integer id, HttpServletResponse response);
+// void exportReporter(Integer id, HttpServletResponse response);
Page<ReportListVo> getPage(Page<ReportListVo> page, ReportParamDto reportParamDto);
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 36555b4..4d4d53b 100644
--- a/src/main/java/com/example/jz/service/impl/ReportServiceImpl.java
+++ b/src/main/java/com/example/jz/service/impl/ReportServiceImpl.java
@@ -42,6 +42,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.function.Consumer;
import java.util.stream.Collectors;
/**
@@ -105,60 +106,63 @@
groupUserDao.delete(new QueryWrapper<GroupUser>().eq("user_id", id).eq("group_id", groupId));
}
- @Override
- @SneakyThrows
- public void exportReporter(Integer id, HttpServletResponse response) {
- //鏌ヨ鎶ユ浜虹浉鍏充俊鎭�氳繃妗堜欢
- List<Report> reports = reportDao.selectList(new QueryWrapper<Report>().eq("cause_id", id).orderByDesc());
- ArrayList<ExportExcelReportVo> exportExcelReportVos = new ArrayList<>();
- reports.forEach(
- a -> {
- ExportExcelReportVo exportExcelReportVo = new ExportExcelReportVo();
- User user = userDao.selectOne(new QueryWrapper<User>().eq("id", a.getUserId()));
- BeanUtils.copyProperties(a, exportExcelReportVo);
- exportExcelReportVo.setUserIdcard(user.getUserIdcard());
- exportExcelReportVo.setUserMobile(user.getUserMobile());
- exportExcelReportVo.setRealName(user.getRealName());
- WriteCellData<List<ImageData>> objectWriteCellData = new WriteCellData<>();
- ArrayList<ImageData> imageDataList = new ArrayList<>();
- if (StringUtils.isNotBlank(a.getReportMaterials())) {
- String[] urls = a.getReportMaterials().split(",");
- if (urls.length == 1) {
- int width = 600;
- try {
- ImageData imageData = new ImageData();
- imageData.setImage(IoUtils.toByteArray(new URL(minIOService.getPreviewFileUrl(urls[0])).openConnection().getInputStream()));
- imageData.setRight(width / 2);
- imageDataList.add(imageData);
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- } else {
- for (int i = 0; i < urls.length; i++) {
- int width = 600;
- try {
- ImageData imageData = new ImageData();
- imageData.setImage(IoUtils.toByteArray(new URL(minIOService.getPreviewFileUrl(urls[i])).openConnection().getInputStream()));
- imageData.setLeft(width / urls.length * i);
- imageData.setRight(width - width / urls.length * (i + 1));
- imageDataList.add(imageData);
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
- }
- }
- objectWriteCellData.setImageDataList(imageDataList);
- exportExcelReportVo.setWriteCellData(objectWriteCellData);
- exportExcelReportVos.add(exportExcelReportVo);
- }
- );
- String name = causeDao.selectOne(new QueryWrapper<Cause>().eq("id", id)).getName();
- response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
- response.setCharacterEncoding("utf-8");
- response.setHeader("Content-disposition", "attachment;filename=" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + URLEncoder.encode(name + ".xlsx", "utf-8"));
- EasyExcel.write(response.getOutputStream(), ExportExcelReportVo.class).sheet("鏉愭枡瀵煎嚭").doWrite(exportExcelReportVos);
- }
+// @Override
+// @SneakyThrows
+// public void exportReporter(Integer id, HttpServletResponse response) {
+// //鏌ヨ鎶ユ浜虹浉鍏充俊鎭�氳繃妗堜欢
+// List<Report> reports = reportDao.selectList(new QueryWrapper<Report>().eq("cause_id", id).orderByDesc());
+// ArrayList<ExportExcelReportVo> exportExcelReportVos = new ArrayList<>();
+// reports.forEach(
+// new Consumer<Report>() {
+// @Override
+// public void accept(Report a) {
+// ExportExcelReportVo exportExcelReportVo = new ExportExcelReportVo();
+// User user = userDao.selectOne(new QueryWrapper<User>().eq("id", a.getUserId()));
+// BeanUtils.copyProperties(a, exportExcelReportVo);
+// exportExcelReportVo.setUserIdcard(user.getUserIdcard());
+// exportExcelReportVo.setUserMobile(user.getUserMobile());
+// exportExcelReportVo.setRealName(user.getRealName());
+// WriteCellData<List<ImageData>> objectWriteCellData = new WriteCellData<>();
+// ArrayList<ImageData> imageDataList = new ArrayList<>();
+// if (StringUtils.isNotBlank(a.getReportMaterials())) {
+// String[] urls = a.getReportMaterials().split(",");
+// if (urls.length == 1) {
+// int width = 600;
+// try {
+// ImageData imageData = new ImageData();
+// imageData.setImage(IoUtils.toByteArray(new URL(minIOService.getPreviewFileUrl(urls[0])).openConnection().getInputStream()));
+// imageData.setRight(width / 2);
+// imageDataList.add(imageData);
+// } catch (Exception e) {
+// throw new RuntimeException(e);
+// }
+// } else {
+// for (int i = 0; i < urls.length; i++) {
+// int width = 600;
+// try {
+// ImageData imageData = new ImageData();
+// imageData.setImage(IoUtils.toByteArray(new URL(minIOService.getPreviewFileUrl(urls[i])).openConnection().getInputStream()));
+// imageData.setLeft(width / urls.length * i);
+// imageData.setRight(width - width / urls.length * (i + 1));
+// imageDataList.add(imageData);
+// } catch (Exception e) {
+// throw new RuntimeException(e);
+// }
+// }
+// }
+// }
+// objectWriteCellData.setImageDataList(imageDataList);
+// exportExcelReportVo.setWriteCellData(objectWriteCellData);
+// exportExcelReportVos.add(exportExcelReportVo);
+// }
+// }
+// );
+// String name = causeDao.selectOne(new QueryWrapper<Cause>().eq("id", id)).getName();
+// response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+// response.setCharacterEncoding("utf-8");
+// response.setHeader("Content-disposition", "attachment;filename=" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")) + URLEncoder.encode(name + ".xlsx", "utf-8"));
+// EasyExcel.write(response.getOutputStream(), ExportExcelReportVo.class).sheet("鏉愭枡瀵煎嚭").doWrite(exportExcelReportVos);
+// }
@Override
public Page<ReportListVo> getPage(Page<ReportListVo> page, ReportParamDto reportParamDto) {
--
Gitblit v1.8.0