diff --git a/src/main/java/com/example/demo/controller/ExportExcelController.java b/src/main/java/com/example/demo/controller/ExportExcelController.java index 884a7ae..6d07f0c 100644 --- a/src/main/java/com/example/demo/controller/ExportExcelController.java +++ b/src/main/java/com/example/demo/controller/ExportExcelController.java @@ -1,36 +1,36 @@ -package com.example.demo.controller; - -import com.example.demo.sevice.DataExportService; -import jakarta.servlet.http.HttpServletResponse; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.CrossOrigin; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.io.IOException; - -@RestController -@RequestMapping("/export") -@RequiredArgsConstructor -@Transactional -@Slf4j -@CrossOrigin -public class ExportExcelController { - - @Autowired - private DataExportService dataExportService; - - @PostMapping("/exportUserExcel") - public void exportUserExcel(HttpServletResponse response) { - try { - dataExportService.exportData(response); - } catch (IOException e) { - e.printStackTrace(); - throw new RuntimeException("导出 Excel 文件失败", e); - } - } -} +//package com.example.demo.controller; +// +//import com.example.demo.sevice.DataExportService; +//import jakarta.servlet.http.HttpServletResponse; +//import lombok.RequiredArgsConstructor; +//import lombok.extern.slf4j.Slf4j; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.transaction.annotation.Transactional; +//import org.springframework.web.bind.annotation.CrossOrigin; +//import org.springframework.web.bind.annotation.PostMapping; +//import org.springframework.web.bind.annotation.RequestMapping; +//import org.springframework.web.bind.annotation.RestController; +// +//import java.io.IOException; +// +//@RestController +//@RequestMapping("/export") +//@RequiredArgsConstructor +//@Transactional +//@Slf4j +//@CrossOrigin +//public class ExportExcelController { +// +// @Autowired +// private DataExportService dataExportService; +// +// @PostMapping("/exportUserExcel") +// public void exportUserExcel(HttpServletResponse response) { +// try { +// dataExportService.exportData(response); +// } catch (IOException e) { +// e.printStackTrace(); +// throw new RuntimeException("导出 Excel 文件失败", e); +// } +// } +//} diff --git a/src/main/java/com/example/demo/domain/entity/Detail.java b/src/main/java/com/example/demo/domain/entity/Detail.java index a315597..b183178 100644 --- a/src/main/java/com/example/demo/domain/entity/Detail.java +++ b/src/main/java/com/example/demo/domain/entity/Detail.java @@ -66,7 +66,7 @@ public class Detail implements Serializable { private BigDecimal free12; private BigDecimal allGold; - + private Integer typeR;//选择退款部分 diff --git a/src/main/java/com/example/demo/domain/entity/UserDetailExport.java b/src/main/java/com/example/demo/domain/entity/UserDetailExport.java index 6c922a5..1dbd484 100644 --- a/src/main/java/com/example/demo/domain/entity/UserDetailExport.java +++ b/src/main/java/com/example/demo/domain/entity/UserDetailExport.java @@ -2,9 +2,12 @@ package com.example.demo.domain.entity; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; +import java.util.Date; @Data @@ -41,8 +44,8 @@ public class UserDetailExport { private BigDecimal taskCoin; @ExcelProperty("提交人") @ColumnWidth(20) - private String submitName; - @ExcelProperty("更新时间") - @ColumnWidth(20) - private String updateTime; + private String createAdmin; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date createTime; } diff --git a/src/main/java/com/example/demo/domain/vo/DetailExport.java b/src/main/java/com/example/demo/domain/vo/DetailExport.java index 031af79..b78b1f3 100644 --- a/src/main/java/com/example/demo/domain/vo/DetailExport.java +++ b/src/main/java/com/example/demo/domain/vo/DetailExport.java @@ -19,4 +19,5 @@ public class DetailExport { @DateTimeFormat(pattern = "yyyy-MM-dd") private Date endDate; + }