搜索调整

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/ExcelUtils.java

@@ -64,6 +64,36 @@ public class ExcelUtils {
         out.close();
     }
 
+    /**
+     * Excel导出
+     *
+     * @param response      response
+     * @param fileName      文件名
+     * @param list          数据List
+     * @param pojoClass     对象Class
+     */
+    public static void exportExcelEpmet(HttpServletResponse response, String fileName, Collection<?> list,
+                                   Class<?> pojoClass) throws IOException {
+        if(StringUtils.isBlank(fileName)){
+            //当前日期
+            fileName = DateUtils.format(new Date());
+        }
+
+        ExportParams exportParams = new ExportParams();
+        //设置导出的样式
+        exportParams.setStyle(EasyPoiExcelExportStylerImpl.class);
+        //设置sheet名称
+        exportParams.setSheetName("Sheet1");
+        Workbook workbook = ExcelExportUtil.exportExcel(exportParams, pojoClass, list);
+        Sheet sheet1 = workbook.getSheetAt(0);
+        sheet1.setDefaultColumnWidth(50*256);
+        //sheet1.setDefaultRowHeight((short)(2*256));
+        ServletOutputStream out = ExcelUtils.getOutputStreamForExcelEpmet(fileName,response);
+        workbook.write(out);
+        out.flush();
+        out.close();
+    }
+
     /**
      * Excel导出，先sourceList转换成List<targetClass>，再导出
      *
@@ -84,6 +114,26 @@ public class ExcelUtils {
         exportExcel(response, fileName, targetList, targetClass);
     }
 
+    /**
+     * Excel导出，先sourceList转换成List<targetClass>，再导出
+     *
+     * @param response      response
+     * @param fileName      文件名
+     * @param sourceList    原数据List
+     * @param targetClass   目标对象Class
+     */
+    public static void exportEpmetExcel(HttpServletResponse response, String fileName, Collection<?> sourceList,
+                                           Class<?> targetClass) throws Exception {
+        List<Object> targetList = new ArrayList<>(sourceList.size());
+        for(Object source : sourceList){
+            Object target = targetClass.newInstance();
+            BeanUtils.copyProperties(source, target);
+            targetList.add(target);
+        }
+
+        exportExcelEpmet(response, fileName, targetList, targetClass);
+    }
+
     public static ServletOutputStream getOutputStreamForExcel(String fileName, HttpServletResponse response) throws IOException {
         fileName = URLEncoder.encode(fileName, "UTF-8");
         if (!fileName.endsWith(".xls") && !fileName.endsWith(".xlsx")){
@@ -97,6 +147,19 @@ public class ExcelUtils {
         return response.getOutputStream();
     }
 
+    public static ServletOutputStream getOutputStreamForExcelEpmet(String fileName, HttpServletResponse response) throws IOException {
+        fileName = URLEncoder.encode(fileName, "UTF-8");
+        if (!fileName.endsWith(".xls") && !fileName.endsWith(".xlsx")){
+            fileName = fileName + ".xls";
+        }
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("utf8");
+        response.setHeader("Content-Disposition", "attachment;filename=" +  fileName);
+        response.addHeader("Access-Control-Expose-Headers", "Content-disposition");
+
+        return response.getOutputStream();
+    }
+
     /**
      * desc:easypoi导出多个sheet
      * @param fileName

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

@@ -0,0 +1,44 @@
+package com.epmet.dto;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 死亡名单表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-05-05
+ */
+@Data
+public class ChangeDeathExportDTO {
+
+
+    @Excel(name = "姓名")
+    private String name;
+
+    @Excel(name = "身份证")
+    private String idCard;
+
+    @Excel(name = "手机号")
+    private String mobile;
+
+    @Excel(name = "性别",replace = { "男_1", "女_0"} )
+    private String gender;
+
+    @Excel(name = "类型",replace = { "房东_1", "租客_0"} )
+    private String type;
+
+    @Excel(name = "加入时间")
+    private String joinDate;
+
+    @Excel(name = "加入原因")
+    private String joinReason;
+
+    @Excel(name = "创建时间", format = "yyyy-MM-dd HH:mm:ss")
+    private Date createdTime;
+
+
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeDeathServiceImpl.java

@@ -92,8 +92,8 @@ public class ChangeDeathServiceImpl extends BaseServiceImpl<ChangeDeathDao, Chan
         wrapper.eq(StringUtils.isNotBlank(name), "NAME", name);
         wrapper.eq(StringUtils.isNotBlank(idCard), "ID_CARD", idCard);
         wrapper.eq(StringUtils.isNotBlank(mobile), "MOBILE", mobile);
-        wrapper.ge(StringUtils.isNotBlank(startTime), "JOIN_DATE", startTime);
-        wrapper.le(StringUtils.isNotBlank(endTime), "JOIN_DATE", endTime);
+        wrapper.ge(StringUtils.isNotBlank(startTime), "DEATH_DATE", startTime);
+        wrapper.le(StringUtils.isNotBlank(endTime), "DEATH_DATE", endTime);
 
         return wrapper;
     }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/ChangeRelocationServiceImpl.java

@@ -106,7 +106,7 @@ public class ChangeRelocationServiceImpl extends BaseServiceImpl<ChangeRelocatio
 
         QueryWrapper<ChangeRelocationEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-        wrapper.eq(StringUtils.isNotBlank(name), "NAME", name);
+        wrapper.like(StringUtils.isNotBlank(name), "NAME", name);
         wrapper.eq(StringUtils.isNotBlank(idCard), "ID_CARD", idCard);
         wrapper.eq(StringUtils.isNotBlank(mobile), "MOBILE", mobile);
         wrapper.ge(StringUtils.isNotBlank(startTime), "OUT_OF_TIME", startTime);