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/modle/vo/CauseReportVo.java | 1 + src/main/java/com/example/jz/controller/ReportController.java | 3 --- src/main/java/com/example/jz/service/impl/CauseServiceImpl.java | 1 + src/main/java/com/example/jz/controller/AnnouncementController.java | 2 ++ src/main/java/com/example/jz/service/impl/ReportServiceImpl.java | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/example/jz/controller/AnnouncementController.java b/src/main/java/com/example/jz/controller/AnnouncementController.java index 9e658d6..9a3a3dd 100644 --- a/src/main/java/com/example/jz/controller/AnnouncementController.java +++ b/src/main/java/com/example/jz/controller/AnnouncementController.java @@ -4,6 +4,7 @@ import com.example.jz.modle.R; import com.example.jz.modle.entity.Announcement; import com.example.jz.service.AnnouncementService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; import org.springframework.web.bind.annotation.*; @@ -18,6 +19,7 @@ */ @RestController @RequestMapping("announcement") +@Api(tags = "缇ゅ叕鍛�") public class AnnouncementController extends ApiController { /** * 鏈嶅姟瀵硅薄 diff --git a/src/main/java/com/example/jz/controller/ReportController.java b/src/main/java/com/example/jz/controller/ReportController.java index ec097f7..0e37f47 100644 --- a/src/main/java/com/example/jz/controller/ReportController.java +++ b/src/main/java/com/example/jz/controller/ReportController.java @@ -13,14 +13,11 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; -import lombok.SneakyThrows; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.Serializable; -import java.util.Date; /** * 鎶ユ琛�(Report)琛ㄦ帶鍒跺眰 diff --git a/src/main/java/com/example/jz/modle/vo/CauseReportVo.java b/src/main/java/com/example/jz/modle/vo/CauseReportVo.java index 6797e65..70e8fe1 100644 --- a/src/main/java/com/example/jz/modle/vo/CauseReportVo.java +++ b/src/main/java/com/example/jz/modle/vo/CauseReportVo.java @@ -8,6 +8,7 @@ @Data @ApiModel(description = "妗堜欢褰曞叆妗堜欢浜哄憳璇︽儏",value = "CauseReportVo") public class CauseReportVo { + private Integer id; //澶村儚鍦板潃 private String pic; //鎶ユ浜篿d diff --git a/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java b/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java index 5a33c46..74f45d3 100644 --- a/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java +++ b/src/main/java/com/example/jz/service/impl/CauseServiceImpl.java @@ -142,6 +142,7 @@ causeReportVo.setIsIntoGroup("0"); } else { causeReportVo.setIsIntoGroup("1"); + causeReportVo.setGroupId(groupDao.selectOne(new QueryWrapper<Group>().eq("cause_id",causeId)).getId()); } return causeReportVo; } 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 3fa340e..7ee12e4 100644 --- a/src/main/java/com/example/jz/service/impl/ReportServiceImpl.java +++ b/src/main/java/com/example/jz/service/impl/ReportServiceImpl.java @@ -143,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); -- Gitblit v1.8.0