福利人员导出调整

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/OrganizationCodeResultDTO.java

@@ -6,7 +6,7 @@ import java.io.Serializable;
 
 /**
  * @program: epmet-cloud
- * @description:小区-楼栋-房屋编码
+ * @description:小区-楼栋-单元-房屋编码
  * @author: wangtong
  * @create: 2022-06-29 09:51
  **/
@@ -14,13 +14,17 @@ import java.io.Serializable;
 public class OrganizationCodeResultDTO implements Serializable {
 
     /**
-     * 可编辑的楼栋编码
+     * 可编辑的编码
      */
     private String coding;
 
-
     /**
-     * 不可编辑的楼栋编码
+     * 不可编辑的编码
      */
     private String sysCoding;
+
+    /**
+     * 不可编辑的前缀编码
+     */
+    private String preCoding;
 }

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

@@ -77,7 +77,7 @@ public class ChangeWelfareController {
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<ChangeWelfareDTO> list = changeWelfareService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, ChangeWelfareExcel.class);
+        ExcelUtils.exportEpmetExcel(response, null, list, ChangeWelfareExcel.class);
     }
 
     /**

epmet-user/epmet-user-server/src/main/java/com/epmet/excel/ChangeWelfareExcel.java

@@ -3,8 +3,6 @@ package com.epmet.excel;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * 福利表
  *
@@ -14,14 +12,14 @@ import java.util.Date;
 @Data
 public class ChangeWelfareExcel {
 
-    @Excel(name = "主键")
+//    @Excel(name = "主键")
-    private String id;
+//    private String id;
-
+//
-    @Excel(name = "epmet用户主键")
+//    @Excel(name = "epmet用户主键")
-    private String userId;
+//    private String userId;
-
+//
-    @Excel(name = "epmet网格ID")
+//    @Excel(name = "epmet网格ID")
-    private String gridId;
+//    private String gridId;
 
     @Excel(name = "姓名")
     private String name;
@@ -32,44 +30,44 @@ public class ChangeWelfareExcel {
     @Excel(name = "手机号")
     private String mobile;
 
-    @Excel(name = "性别 0女 1男")
+    @Excel(name = "性别",replace = { "男_1", "女_0", "女_2", " _null"} )
     private String gender;
 
-    @Excel(name = "类型")
+//    @Excel(name = "类型")
-    private String type;
+//    private String type;
-
+//
     @Excel(name = "加入时间")
     private String joinDate;
-
+//
-    @Excel(name = "加入原因")
+//    @Excel(name = "加入原因")
-    private String joinReason;
+//    private String joinReason;
-
+
-    @Excel(name = "移除时间")
+//    @Excel(name = "移除时间")
-    private String removeDate;
+//    private String removeDate;
-
+//
-    @Excel(name = "移除原因")
+//    @Excel(name = "移除原因")
-    private String removeReason;
+//    private String removeReason;
-
+//
-    @Excel(name = "删除标记 0：未删除，1：已删除")
+//    @Excel(name = "删除标记 0：未删除，1：已删除")
-    private String delFlag;
+//    private String delFlag;
-
+
-    @Excel(name = "乐观锁")
+//    @Excel(name = "乐观锁")
-    private Integer revision;
+//    private Integer revision;
-
+//
-    @Excel(name = "创建人")
+//    @Excel(name = "创建人")
-    private String createdBy;
+//    private String createdBy;
-
+//
-    @Excel(name = "创建时间")
+//    @Excel(name = "创建时间")
-    private Date createdTime;
+//    private Date createdTime;
-
+//
-    @Excel(name = "更新人")
+//    @Excel(name = "更新人")
-    private String updatedBy;
+//    private String updatedBy;
-
+//
-    @Excel(name = "更新时间")
+//    @Excel(name = "更新时间")
-    private Date updatedTime;
+//    private Date updatedTime;
-
+//
-    @Excel(name = "客户ID")
+//    @Excel(name = "客户ID")
-    private String customerId;
+//    private String customerId;
 
 
 }