From d2c099825a86e0c50336dc76c190cebf8421e2ca Mon Sep 17 00:00:00 2001
From: luyan <xgktv007@163.com>
Date: Wed, 28 Jun 2023 14:21:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E5=AF=BC=E5=87=BA=E7=9A=84?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=92=8C=E7=BD=91=E6=A0=BC=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PovertyManageController.java   | 14 +++---
 .../com/epmet/excel/PovertyManageExcel.java   | 45 ++++---------------
 2 files changed, 14 insertions(+), 45 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/PovertyManageController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/PovertyManageController.java
index 52645b588f..b27484e4bc 100755
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/PovertyManageController.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/PovertyManageController.java
@@ -5,8 +5,6 @@ import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.enums.DictTypeEnum;
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
-import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
@@ -99,16 +97,16 @@ public class PovertyManageController {
     public void exportExcelByEasyExcel(@RequestBody PovertyManageFormDto formDTO, HttpServletResponse response) throws Exception {
         formDTO.setPageNo(NumConstant.ONE);
         formDTO.setPageSize(NumConstant.TEN_THOUSAND);
-        AgencyInfoCache agency = CustomerOrgRedis.getAgencyInfo(userRemoteService.getLoginUserDetails().getAgencyId());
-        String agencyName = agency.getOrganizationName();
+//        AgencyInfoCache agency = CustomerOrgRedis.getAgencyInfo(userRemoteService.getLoginUserDetails().getAgencyId());
+//        String agencyName = agency.getOrganizationName();
         PageData<PovertyManageDTO> data = povertyManageService.search(formDTO);
         formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE);
         if (null != data && data.getList().size() > 0) {
             buildData(data.getList());
-            for (PovertyManageDTO dto : data.getList()) {
-                dto.setAgencyId(agencyName);
-                dto.setGridId(CustomerOrgRedis.getGridInfo(dto.getGridId()).getGridName());
-            }
+//            for (PovertyManageDTO dto : data.getList()) {
+//                dto.setAgencyId(agencyName);
+//                dto.setGridId(CustomerOrgRedis.getGridInfo(dto.getGridId()).getGridName());
+//            }
         }
         ExcelUtils.exportExcelToTarget(response, "贫困人员名单.xls", data.getList(), PovertyManageExcel.class);
     }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/PovertyManageExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/PovertyManageExcel.java
index eae8be9793..f46011e930 100755
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/PovertyManageExcel.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/PovertyManageExcel.java
@@ -3,28 +3,18 @@ package com.epmet.excel;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
- * 
- *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2023-06-16
  */
 @Data
 public class PovertyManageExcel {
 
-    @Excel(name = "主键ID")
-    private String id;
-
-    @Excel(name = "居民ID")
-    private String resiUserId;
-
-    @Excel(name = "组织ID")
-    private String agencyId;
-
-    @Excel(name = "网格ID")
-    private String gridId;
+//    @Excel(name = "社区(组织)名称")
+//    private String agencyId;
+//
+//    @Excel(name = "网格名称")
+//    private String gridId;
 
     @Excel(name = "姓名")
     private String userName;
@@ -36,28 +26,9 @@ public class PovertyManageExcel {
     private String idCard;
 
     @Excel(name = "贫困属性")
-    private Integer povertyType;
+    private String povertyType;
 
-    @Excel(name = "脱贫状态")
+    @Excel(name = "脱贫状态", replace = {"未脱贫_0", "已脱贫_1"})
     private Integer povertyStatus;
 
-    @Excel(name = "删除标识：0.未删除 1.已删除")
-    private Integer delFlag;
-
-    @Excel(name = "乐观锁")
-    private Integer revision;
-
-    @Excel(name = "创建人")
-    private String createdBy;
-
-    @Excel(name = "创建时间")
-    private Date createdTime;
-
-    @Excel(name = "更新人")
-    private String updatedBy;
-
-    @Excel(name = "更新时间")
-    private Date updatedTime;
-
-
-}
\ No newline at end of file
+}