核酸比对导出

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatCompareRecordDTO.java

@@ -1,5 +1,9 @@
 package com.epmet.dto;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -17,64 +21,90 @@ public class IcNatCompareRecordDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ExcelIgnore
     private String customerId;
 
     /**
      * 主键
      */
-	private String id;
+    @ExcelIgnore
+    private String id;
 
     /**
      * 姓名
      */
-	private String name;
+    @ColumnWidth(15)
+    @ExcelProperty("姓名")
+    private String name;
 
     /**
      * 真实身份证号
      */
+    @ColumnWidth(20)
+    @ExcelProperty("身份证号")
     private String realIdCard;
 
     /**
      * 身份证
      */
-	private String idCard;
+    @ExcelIgnore
+    private String idCard;
 
     /**
      * 手机号
      */
-	private String mobile;
+    @ExcelIgnore
+    private String mobile;
 
     /**
      * 真实手机号
      */
+    @ColumnWidth(20)
+    @ExcelProperty("手机号")
     private String realMobile;
 
     /**
      * 是否客户下居民(0:否  1:是)
      */
-	private String isResiUser;
+    @ExcelIgnore
+    private String isResiUser;
+
+    @ColumnWidth(10)
+    @ExcelProperty("本辖区居民")
     private String isResiUserDesc;
 
     /**
      * 是本辖区的居民时候，ic_resi_user.id
      */
-	private String icResiUserId;
+    @ExcelIgnore
+    private String icResiUserId;
 
     /**
      * 最近一次核酸时间:接口填入
      */
-	private Date latestNatTime;
+    @ColumnWidth(30)
+    @ExcelProperty("最近一次核酸时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date latestNatTime;
 
     /**
      * 检测结果(0:阴性  1:阳性):接口填入
      */
-	private String natResult;
+    @ExcelIgnore
+    private String natResult;
+
 
-    private String natResultDesc;
     /**
      * 检测地点:接口填入
      */
-	private String natAddress;
+    @ColumnWidth(50)
+    @ExcelProperty("检测地点")
+    private String natAddress;
+
+
+    @ColumnWidth(15)
+    @ExcelProperty("检测结果")
+    private String natResultDesc;
 
 
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatCompareRecordController.java

@@ -14,8 +14,6 @@ import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter;
 import com.epmet.dto.IcNatCompareRecordDTO;
-import com.epmet.dto.IcTripReportRecordDTO;
-import com.epmet.dto.form.PageTripReportFormDTO;
 import com.epmet.dto.form.yqfk.IcNatCompareRecordPageFormDTO;
 import com.epmet.service.IcNatCompareRecordService;
 import lombok.extern.slf4j.Slf4j;
@@ -67,7 +65,7 @@ public class IcNatCompareRecordController {
      */
     @NoRepeatSubmit
     @PostMapping("export")
-    public void export(@LoginUser TokenDto tokenDto, @RequestBody PageTripReportFormDTO formDTO, HttpServletResponse response) {
+    public void export(@LoginUser TokenDto tokenDto, @RequestBody IcNatCompareRecordPageFormDTO formDTO, HttpServletResponse response) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setUserId(tokenDto.getUserId());
         // formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc");
@@ -79,12 +77,12 @@ public class IcNatCompareRecordController {
         try {
             // 这里 需要指定写用哪个class去写
             String today= DateUtils.format(new Date(),DateUtils.DATE_PATTERN_MMDD);
-            String fileName = "行程上报信息".concat(today);
+            String fileName = "核酸比对".concat(today);
-            excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcTripReportRecordDTO.class).build();
+            excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcNatCompareRecordDTO.class).build();
             WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build();
-            PageData<IcTripReportRecordDTO> data = null;
+            PageData<IcNatCompareRecordDTO> data = null;
             do {
-                // data = icTripReportRecordService.page(formDTO);
+                data = icNatCompareRecordService.page(formDTO);
                 formDTO.setPageNo(++pageNo);
                 excelWriter.write(data.getList(), writeSheet);
             } while (CollectionUtils.isNotEmpty(data.getList()) && data.getList().size() == formDTO.getPageSize());