居民画像导出

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/ResiPortrayalDetailDTO.java

@@ -21,8 +21,9 @@ public class ResiPortrayalDetailDTO {
     @ExcelIgnore
     private String gridId;
 
-    @ExcelProperty(value = "所属网格")
-    @ColumnWidth(30)
+    @ExcelIgnore
+    // @ExcelProperty(value = "所属网格")
+    // @ColumnWidth(30)
     private String gridName;
 
     /**
@@ -53,8 +54,9 @@ public class ResiPortrayalDetailDTO {
     @ExcelIgnore
     private String homeId;
 
-    @ExcelProperty(value = "所属房屋")
-    @ColumnWidth(30)
+    @ExcelIgnore
+    // @ExcelProperty(value = "所属房屋")
+    // @ColumnWidth(30)
     private String homeName;
 
     /**

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

@@ -1593,7 +1593,7 @@ public class IcResiUserController implements ResultDataResolver {
             List<ResiPortrayalDetailDTO> list = null;
             do {
                 // 默认查询本组织及下级
-                data = icResiUserService.queryPortrayalResiList(EpmetRequestHolder.getLoginUserCustomerId(),EpmetRequestHolder.getLoginUserId(),
+                data = icResiUserService.queryPortrayalResiListForExport(EpmetRequestHolder.getLoginUserCustomerId(),EpmetRequestHolder.getLoginUserId(),
                         formDTO.getPageNo(),formDTO.getPageSize(),
                         formDTO.getOrgId(),formDTO.getOrgType(),
                         formDTO.getCodeType(),formDTO.getCode());

epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java

@@ -585,4 +585,21 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
                                                             Integer pageNo, Integer pageSize,
                                                             String orgId, String orgType,
                                                             String codeType,String code);
+
+    /**
+     * 导出居民画像，居民列表调用此方法。只导出列表信息
+     * @param customerId
+     * @param staffId
+     * @param pageNo
+     * @param pageSize
+     * @param orgId
+     * @param orgType
+     * @param codeType
+     * @param code
+     * @return
+     */
+    PageData<ResiPortrayalDetailDTO> queryPortrayalResiListForExport(String customerId, String staffId,
+                                                            Integer pageNo, Integer pageSize,
+                                                            String orgId, String orgType,
+                                                            String codeType,String code);
 }

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

@@ -4099,5 +4099,38 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         return new PageData<>(list, pageInfo.getTotal(), pageSize);
     }
 
+    @Override
+    public PageData<ResiPortrayalDetailDTO> queryPortrayalResiListForExport(String customerId, String staffId,
+                                                                   Integer pageNo, Integer pageSize,
+                                                                   String orgId, String orgType,
+                                                                   String codeType,
+                                                                   String code) {
+        // 获取文化程度字典
+        DictListFormDTO dictFormDTO = new DictListFormDTO();
+        dictFormDTO.setDictType(DictTypeEnum.EDUCATION.getCode());
+        Result<List<DictListResultDTO>> dictResult = epmetAdminOpenFeignClient.dictList(dictFormDTO);
+        if (!dictResult.success() || CollectionUtils.isEmpty(dictResult.getData())) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "学历字典获取失败", "学历字典获取失败");
+        }
+        Map<String, String> educationMap = dictResult.getData().stream().collect(Collectors.toMap(DictListResultDTO::getValue, DictListResultDTO::getLabel));
 
+        if (StringUtils.isBlank(orgId)) {
+            orgId = CustomerStaffRedis.getStaffInfo(customerId, staffId).getAgencyId();
+            orgType = OrgTypeEnum.AGENCY.getCode();
+        }
+        String orgIdPath=StrConstant.EPMETY_STR;
+        if(OrgTypeEnum.AGENCY.getCode().equals(orgType)){
+            orgIdPath=CustomerOrgRedis.getOrgIdPath(orgId,orgType);
+        }
+        PageHelper.startPage(pageNo, pageSize);
+        List<ResiPortrayalDetailDTO> list = baseDao.selectPortrayalResiList(customerId, orgId, orgType,orgIdPath,codeType, code);
+        if(CollectionUtils.isNotEmpty(list)){
+            list.forEach(resi -> {
+                // 学历名称
+                resi.setEducationName(educationMap.get(resi.getEducationCode()));
+            });
+        }
+        PageInfo<ResiPortrayalDetailDTO> pageInfo = new PageInfo<>(list);
+        return new PageData<>(list, pageInfo.getTotal(), pageSize);
+    }
 }