From 53d6e1f54ec17280a4a20e8701787e814e74f135 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期五, 29 七月 2022 09:24:40 +0800
Subject: [PATCH] 修改导出文件格式,和案件群组id判断
---
src/main/java/com/example/jz/service/impl/ReportServiceImpl.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 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 d6f26ba..7ee12e4 100644
--- a/src/main/java/com/example/jz/service/impl/ReportServiceImpl.java
+++ b/src/main/java/com/example/jz/service/impl/ReportServiceImpl.java
@@ -3,6 +3,7 @@
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.metadata.data.ImageData;
import com.alibaba.excel.metadata.data.WriteCellData;
+import com.alibaba.excel.support.ExcelTypeEnum;
import com.alibaba.excel.util.IoUtils;
import com.alibaba.excel.util.StringUtils;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -12,12 +13,19 @@
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;
+import com.example.jz.modle.entity.GroupUser;
+import com.example.jz.modle.entity.Report;
+import com.example.jz.modle.entity.User;
+import com.example.jz.modle.vo.ReportListVo;
+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;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -28,9 +36,11 @@
import java.io.Serializable;
import java.net.URL;
import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
+import java.io.Serializable;
import java.util.Date;
import java.util.List;
@@ -133,7 +143,7 @@
}
);
String name = causeDao.selectOne(new QueryWrapper<Cause>().eq("id", id)).getName();
- response.setContentType("application/vnd.ms-excel");
+ 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);
@@ -168,15 +178,22 @@
.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;
}
-}
\ No newline at end of file
+}
+
--
Gitblit v1.8.0