From a800938e10736b81762cd98e207600690d7044b5 Mon Sep 17 00:00:00 2001
From: 安瑾然 <107107765@qq.com>
Date: 星期四, 21 七月 2022 17:37:54 +0800
Subject: [PATCH] commit
---
src/main/java/com/example/jz/service/impl/ReportServiceImpl.java | 53 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 35 insertions(+), 18 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 d6dd6c8..3fa340e 100644
--- a/src/main/java/com/example/jz/service/impl/ReportServiceImpl.java
+++ b/src/main/java/com/example/jz/service/impl/ReportServiceImpl.java
@@ -10,10 +10,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.example.jz.dao.GroupDao;
-import com.example.jz.dao.GroupUserDao;
-import com.example.jz.dao.ReportDao;
-import com.example.jz.dao.UserDao;
+import com.example.jz.dao.*;
import com.example.jz.modle.dto.AddReportDto;
import com.example.jz.modle.dto.ReportParamDto;
import com.example.jz.modle.entity.Group;
@@ -24,6 +21,7 @@
import com.example.jz.dao.*;
import com.example.jz.modle.entity.*;
import com.example.jz.modle.vo.ExportExcelReportVo;
+import com.example.jz.modle.vo.ReportListVo;
import com.example.jz.service.MinIOService;
import com.example.jz.service.ReportService;
import lombok.SneakyThrows;
@@ -35,6 +33,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
+import java.io.Serializable;
import java.net.URL;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
@@ -113,28 +112,40 @@
ArrayList<ImageData> imageDataList = new ArrayList<>();
if (StringUtils.isNotBlank(a.getReportMaterials())) {
String[] urls = a.getReportMaterials().split(",");
- for (int i = 0; i < urls.length; i++) {
- int width=600;
+ if (urls.length == 1) {
+ 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));
+ 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);
+ }
+ objectWriteCellData.setImageDataList(imageDataList);
+ exportExcelReportVo.setWriteCellData(objectWriteCellData);
+ exportExcelReportVos.add(exportExcelReportVo);
}
);
String name = causeDao.selectOne(new QueryWrapper<Cause>().eq("id", id)).getName();
- response.setHeader("Content-disposition", "attachment;filename="+ LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))+URLEncoder.encode(name+".xlsx","utf-8"));
- response.setCharacterEncoding("utf-8");
response.setContentType("application/vnd.ms-excel");
+ 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);
}
@@ -152,7 +163,7 @@
@Override
public Page<ReportListVo> getPageByGroupId(Page<ReportListVo> page, ReportParamDto reportParamDto, Integer groupId) {
- Page<ReportListVo> aaa = reportDao.getPageByGroupId(page, reportParamDto,groupId);
+ Page<ReportListVo> aaa = reportDao.getPageByGroupId(page, reportParamDto, groupId);
aaa.getRecords().stream().forEach(x -> x.setIdcard(x.getIdcard().replaceAll("(?<=[\\d]{3})\\d(?=[\\d]{4})", "*")));
return aaa;
}
@@ -167,15 +178,21 @@
.setModifyTime(new Date()).setUserRegtime(new Date()).setPic(addReportDto.getPic());
userDao.insert(user);
}
+ // 娣诲姞浜哄憳杩涚兢缁�
+ groupUserDao.insert(new GroupUser()
+ .setGroupId(groupDao.selectOne(new QueryWrapper<Group>().eq("cause_id", addReportDto.getCauseId())).getId())
+ .setUserId(user.getId()).setCtime(new Date())
+ .setBanSpeech(0));
// 娣诲姞鎶ユ淇℃伅
Report report = new Report();
BeanUtils.copyProperties(addReportDto, report);
report
.setUserId(user.getId())
.setCtime(new Date())
- .setStatus(0)
+ .setStatus(1)
.setReportMethod("鐜板満褰曞叆")
- .setIsCommission("0").setReportTime(new Date());
+ .setIsCommission("0").setReportTime(new Date())
+ .setCauseId(addReportDto.getCauseId());
return reportDao.insert(report) > 0;
}
}
--
Gitblit v1.8.0