Merge remote-tracking branch 'remotes/origin/develop' into release_temp

epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/form/CategoryProjectListFormDTO.java

@@ -11,12 +11,13 @@ import java.io.Serializable;
  * @DESC
  */
 @Data
-public class CategoryProjectListFormDTO implements Serializable {
+public class CategoryProjectListFormDTO extends ProjectCategoryFormDTO implements Serializable {
 
     private static final long serialVersionUID = -5448734274886241594L;
 
     public interface CategoryProjectListForm{}
 
+
     @NotNull(message = "pageSize不能为空",groups = CategoryProjectListForm.class)
     private Integer pageSize;
 
@@ -26,22 +27,21 @@ public class CategoryProjectListFormDTO implements Serializable {
     /**
      * 项目状态：closed：已结案，all：全部
      */
-    @NotNull(message = "status不能为空",groups = CategoryProjectListForm.class)
+    @NotNull(message = "status不能为空",groups = {CategoryProjectListForm.class, CategoryProjectExportForm.class})
     private String status;
 
-    @NotNull(message = "categoryCode不能为空",groups = CategoryProjectListForm.class)
+    @NotNull(message = "categoryCode不能为空",groups = {CategoryProjectListForm.class, CategoryProjectExportForm.class})
     private String categoryCode;
 
+    @NotNull(message = "categoryName不能为空",groups = CategoryProjectExportForm.class)
+    private String categoryName;
+    private String parentCategoryName;
+
     /**
      * 组织ID
      */
     private String orgId;
 
-    /**
-     * 组织类型：agency：组织，grid：网格
-     */
-    private String orgType;
-
     /**
      * 是否分页，默认true，false的时候 给导出用
      */

epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/form/ProjectCategoryFormDTO.java

@@ -16,6 +16,7 @@ public class ProjectCategoryFormDTO implements Serializable {
     private static final long serialVersionUID = 5047143743629810527L;
 
     public interface ProjectCategoryForm{}
+    public interface CategoryProjectExportForm {}
 
     /**
      * 组织ID
@@ -27,7 +28,7 @@ public class ProjectCategoryFormDTO implements Serializable {
      */
     private String orgType;
 
-    @NotBlank(message = "结束时间不能为空",groups = ProjectCategoryForm.class)
+    @NotBlank(message = "结束时间不能为空",groups = {ProjectCategoryForm.class,CategoryProjectExportForm.class})
     private String endTime;
 
     /**

epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/CategoryProjectListResultDTO.java

@@ -45,6 +45,21 @@ public class CategoryProjectListResultDTO implements Serializable {
      */
     private String projectId;
 
+    /**
+     * 上报人
+     */
+    private String linkName;
+
+    /**
+     * 上报人电话
+     */
+    private String linkMobile;
+
+    /**
+     * 事件地址
+     */
+    private String projectAddress;
+
     @JsonIgnore
     private String orgId;
 

epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/ProjectCategoryResultDTO.java

@@ -23,11 +23,21 @@ public class ProjectCategoryResultDTO implements Serializable {
      */
     private String categoryCode;
 
+    /**
+     * 分类code父级
+     */
+    private String parentCategoryCode;
+
     /**
      * 分类名字
      */
     private String categoryName;
 
+    /**
+     * 分类名字父级
+     */
+    private String parentCategoryName;
+
     /**
      * 项目总数
      */

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java

@@ -29,6 +29,7 @@ import com.epmet.project.dto.result.ProjectCategoryResultDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Workbook;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -195,20 +196,13 @@ public class ScreenProjectController {
      * @date 2021/11/4 3:38 下午
      */
     @PostMapping("selectprojectcategory/export")
-    public void selectProjectCategoryExport(@RequestBody ProjectCategoryFormDTO formDTO, /*@LoginUser*/ TokenDto tokenDto, HttpServletResponse response) throws Exception {
-        tokenDto.setUserId("36bc0fb38565ecdebf8ab9b476b44548");
-        tokenDto.setCustomerId("45687aa479955f9d06204d415238f7cc");
-        ValidatorUtils.validateEntity(formDTO, ProjectCategoryFormDTO.ProjectCategoryForm.class);
+    public void selectProjectCategoryExport(@RequestBody ProjectCategoryFormDTO formDTO, @LoginUser TokenDto tokenDto, HttpServletResponse response) throws Exception {
+        //tokenDto.setUserId("36bc0fb38565ecdebf8ab9b476b44548");
+        //tokenDto.setCustomerId("45687aa479955f9d06204d415238f7cc");
+        ValidatorUtils.validateEntity(formDTO, ProjectCategoryFormDTO.CategoryProjectExportForm.class);
         List<ProjectCategoryResultDTO> data = screenProjectService.selectProjectCategory(formDTO, tokenDto);
         String templatePath = "excel/project_category_temp.xlsx";
 
-        StringBuilder dateBuilder = new StringBuilder();
-        if (StringUtils.isNotBlank(formDTO.getStartTime())){
-            dateBuilder.append(formDTO.getStartTime()).append(StrConstant.HYPHEN);
-        }
-        if (StringUtils.isNotBlank(formDTO.getEndTime())){
-            dateBuilder.append(formDTO.getEndTime());
-        }
         List<ProjectCategoryResultDTO> resultDTOList = new ArrayList<>();
         data.forEach(e->{
             resultDTOList.add(e);
@@ -219,7 +213,7 @@ public class ScreenProjectController {
         Map<String,Object> mapData = new HashMap<>();
         mapData.put("list",resultDTOList);
         mapData.put("orgName",staffInfo.getAgencyName());
-        mapData.put("exportDate",dateBuilder.toString());
+        mapData.put("exportDate",getExportDateStr(formDTO.getStartTime(),formDTO.getEndTime()));
         Workbook workbook = ExcelExportUtil.exportExcel(new TemplateExportParams(templatePath), mapData);
         response.setHeader("content-Type", "application/vnd.ms-excel");
         response.addHeader("Content-Disposition", "attachment;fileName=" + URLEncoder.encode("项目分类统计.xls", "UTF-8"));
@@ -239,4 +233,50 @@ public class ScreenProjectController {
         return new Result<PageCategoryProjectListResultDTO>().ok(screenProjectService.selectCategoryProjectList(formDTO,tokenDto));
     }
 
+    /**
+     * @Description 【项目分类】查询项目分类
+     * @param formDTO
+     * @param tokenDto
+     * @author zxc
+     * @date 2021/11/4 3:38 下午
+     */
+    @PostMapping("selectcategoryprojectlist/export")
+    public void selectProjectCategoryExport(@RequestBody CategoryProjectListFormDTO formDTO,/*@LoginUser*/ TokenDto tokenDto, HttpServletResponse response) throws Exception {
+        tokenDto.setUserId("36bc0fb38565ecdebf8ab9b476b44548");
+        tokenDto.setCustomerId("45687aa479955f9d06204d415238f7cc");
+        formDTO.setIsPage(false);
+        formDTO.setStatus("all");
+        formDTO.setCategoryCode("0102");
+        ValidatorUtils.validateEntity(formDTO, ProjectCategoryFormDTO.CategoryProjectExportForm.class);
+        PageCategoryProjectListResultDTO data = screenProjectService.selectCategoryProjectList(formDTO,tokenDto);
+        String templatePath = "excel/project_temp.xlsx";
+
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+        Map<String,Object> mapData = new HashMap<>();
+        mapData.put("list",data.getList());
+        mapData.put("orgName",staffInfo.getAgencyName());
+        mapData.put("exportDate",getExportDateStr(formDTO.getStartTime(),formDTO.getEndTime()));
+        mapData.put("categoryName", formDTO.getCategoryName());
+        if (StringUtils.isNotBlank(formDTO.getParentCategoryName())){
+            mapData.put("categoryName", formDTO.getParentCategoryName().concat(StrConstant.HYPHEN).concat(formDTO.getCategoryName()));
+        }
+
+        Workbook workbook = ExcelExportUtil.exportExcel(new TemplateExportParams(templatePath), mapData);
+        response.setHeader("content-Type", "application/vnd.ms-excel");
+        response.addHeader("Content-Disposition", "attachment;fileName=" + URLEncoder.encode("项目统计.xls", "UTF-8"));
+        workbook.write(response.getOutputStream());
+    }
+
+    @NotNull
+    private String getExportDateStr(String startTime,String endTime) {
+        StringBuilder dateBuilder = new StringBuilder();
+        if (StringUtils.isNotBlank(startTime)) {
+            dateBuilder.append(startTime).append(StrConstant.HYPHEN);
+        }
+        if (StringUtils.isNotBlank(endTime)) {
+            dateBuilder.append(endTime);
+        }
+        return dateBuilder.toString();
+    }
+
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java

@@ -308,9 +308,12 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
         result.forEach(r -> {
             finalEndCategoryList.stream().filter(e -> r.getCategoryCode().equals(e.getCategoryCode())).forEach(e -> {
                 r.setTotalRatio(e.getTotalRatio());r.setClosedRatio(e.getClosedRatio());
+                r.setProjectTotal(e.getProjectTotal());
+                r.setClosedProjectTotal(e.getClosedProjectTotal());
             });
             r.getChildren().forEach(son -> finalEndCategoryList.stream().filter(e -> son.getCategoryCode().equals(e.getCategoryCode())).forEach(e -> {
                 son.setTotalRatio(e.getTotalRatio());son.setClosedRatio(e.getClosedRatio());
+                son.setProjectTotal(e.getProjectTotal());son.setClosedProjectTotal(e.getClosedProjectTotal());
             }));
         });
         // 排序

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectCategoryOrgDailyDao.xml

@@ -94,9 +94,12 @@
     <resultMap id="selectCategoryByCustomerIdMap" type="com.epmet.project.dto.result.ProjectCategoryResultDTO">
         <result column="c" property="categoryCode"/>
         <result column="n" property="categoryName"/>
+        <result column="pc1" property="parentCategoryCode"/>
         <collection property="children" ofType="com.epmet.project.dto.result.ProjectCategoryResultDTO">
             <result column="c2" property="categoryCode"/>
             <result column="n2" property="categoryName"/>
+            <result column="pc2" property="parentCategoryCode"/>
+            <result column="n" property="parentCategoryName"/>
         </collection>
     </resultMap>
     <select id="selectCategoryByCustomerId" resultMap="selectCategoryByCustomerIdMap">
@@ -104,7 +107,9 @@
             p1.CATEGORY_CODE AS c,
             p2.CATEGORY_CODE AS c2,
             p1.CATEGORY_NAME AS n,
-            p2.CATEGORY_NAME AS n2
+            p2.CATEGORY_NAME AS n2,
+            p1.PARENT_CATEGORY_CODE AS pc1,
+            p2.PARENT_CATEGORY_CODE AS pc2
         FROM customer_project_category_dict p1,customer_project_category_dict p2
         WHERE p1.DEL_FLAG = '0'
           AND p2.DEL_FLAG = '0'

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml

@@ -168,7 +168,10 @@
             DATE_FORMAT(PROJECT_CREATE_TIME,'%Y-%m-%d %h:%i:%s') AS createTime,
             ORG_ID,
             ORG_TYPE,
-            PROJECT_ID
+            PROJECT_ID,
+            LINK_NAME,
+            LINK_MOBILE,
+            PROJECT_ADDRESS
         FROM screen_project_data
         WHERE DEL_FLAG = '0'
           <if test=' status == "closed" '>

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -522,4 +522,7 @@ public interface GovOrgOpenFeignClient {
 
     @PostMapping("/gov/org/building/buildinglistbyids")
     Result<List<BuildingResultDTO>> buildingListByIds(@RequestBody List<String> buildingIdList);
+
+    @PostMapping("/gov/org/icneighborhood/getlistbyids")
+    Result<List<IcNeighborHoodDTO>> getListByIds(@RequestBody List<String> ids);
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

@@ -320,6 +320,11 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "buildingListByIds", buildingIdList);
     }
 
+    @Override
+    public Result<List<IcNeighborHoodDTO>> getListByIds(List<String> ids) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getListByIds", ids);
+    }
+
     @Override
     public Result<String> selectPidsByGridId(String gridId) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "selectPidsByGridId", gridId);

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java

@@ -95,4 +95,16 @@ public class IcNeighborHoodController {
         return new Result<List<OptionResultDTO>>().ok(icNeighborHoodService.getNeighborHoodOptions(dto.getAgencyId(), dto.getGridId()));
     }
 
+    /**
+     * @Description 通过ID查询小区信息
+     * @Param ids
+     * @Return {@link Result< List< IcNeighborHoodDTO>>}
+     * @Author zhaoqifeng
+     * @Date 2021/11/8 10:46
+     */
+    @PostMapping("getlistbyids")
+    public Result<List<IcNeighborHoodDTO>> getListByIds(@RequestBody List<String> ids) {
+        return new Result<List<IcNeighborHoodDTO>>().ok(icNeighborHoodService.getListByIds(ids));
+    }
+
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java

@@ -103,4 +103,13 @@ public interface IcNeighborHoodService extends BaseService<IcNeighborHoodEntity>
      * @Date 2021/10/26 14:32
      */
     List<OptionResultDTO> getNeighborHoodOptions(String agencyId, String gridId);
+
+    /**
+     * @Description 通过ID查询小区信息
+     * @Param ids
+     * @Return {@link List< IcNeighborHoodDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/11/8 10:45
+     */
+    List<IcNeighborHoodDTO> getListByIds(List<String> ids);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java

@@ -134,4 +134,23 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
         }).collect(Collectors.toList());
     }
 
+    /**
+     * @param ids
+     * @Description 通过ID查询小区信息
+     * @Param ids
+     * @Return {@link List< IcNeighborHoodDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/11/8 10:45
+     */
+    @Override
+    public List<IcNeighborHoodDTO> getListByIds(List<String> ids) {
+        if (CollectionUtils.isEmpty(ids)) {
+            return Collections.emptyList();
+        }
+        LambdaQueryWrapper<IcNeighborHoodEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(IcNeighborHoodEntity::getId, ids);
+        List<IcNeighborHoodEntity> list = baseDao.selectList(wrapper);
+        return ConvertUtils.sourceToTarget(list, IcNeighborHoodDTO.class);
+    }
+
 }

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

@@ -60,7 +60,10 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
     // 错误和跳过excel行暂存
     public static final ThreadLocal<Map<String, List<ErrorRow>>> errorRows = new ThreadLocal<>();
     public static final ThreadLocal<Map<String, List<SkipedRow>>> skipedRows = new ThreadLocal<>();
-    
+
+    // 导入数字赋能平台居民信息form_code
+    public static final String IMPORT_IC_RESI_FORM_CODE = "resi_base_info";
+
     @Autowired
     private LoginUserUtil loginUserUtil;
 
@@ -75,7 +78,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
 
     @Autowired
     private OperCustomizeOpenFeignClient operCustomizeOpenFeignClient;
-    
+
     @Autowired
     private IcResiUserDao icResiUserDao;
 
@@ -92,7 +95,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
         private String columnName;
         private String itemType;
         private String itemId;
-        
+
         // 是否必填
         private Integer required;
         private List<Integer> colIndexs;
@@ -115,7 +118,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
          */
         private String optionSourceValue;
     }
-    
+
     /**
      * 错误行信息
      */
@@ -124,9 +127,9 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
 
         @Excel(name = "工作表", width = 30)
         private String sheetName;
-        
+
         private String tableName;
-        
+
         @Excel(name = "身份证号", width = 40)
         private String idCard;
 
@@ -142,9 +145,9 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
 
         @Excel(name = "工作表")
         private String sheetName;
-        
+
         private String tableName;
-        
+
         @Excel(name = "身份证号")
         private String idCard;
 
@@ -182,15 +185,15 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
             initThreadLocalRowsStorage();
 
             // 上传主表信息
-            importIcResiBaseInfoFromExcel(excelPathName, IcResiUserTableEnums.IC_RESI_USER.getSheetNo(), IcResiUserTableEnums.IC_RESI_USER.getHeadRowNo(), 
-                                currUserAgencyId, agencyInfo.getPids(), loginUserId, IcResiUserTableEnums.IC_RESI_USER.getTableName());
+            importIcResiBaseInfoFromExcel(excelPathName, IcResiUserTableEnums.IC_RESI_USER.getSheetNo(), IcResiUserTableEnums.IC_RESI_USER.getHeadRowNo(),
+                    currUserAgencyId, agencyInfo.getPids(), loginUserId, IcResiUserTableEnums.IC_RESI_USER.getTableName());
 
             // 上传附表信息
             for (IcResiUserTableEnums sheet : IcResiUserTableEnums.values()) {
                 if (sheet == IcResiUserTableEnums.IC_RESI_USER) {
-                    continue;    
+                    continue;
                 }
-                
+
                 try {
                     importIcResiExtraInfoFromExcel(excelPathName, sheet.getSheetNo(), sheet.getHeadRowNo(), currUserAgencyId, loginUserId, sheet.getTableName(), customerId);
                 } catch (Exception e) {
@@ -205,7 +208,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
 
             String errors = JSON.toJSONString(errorRows.get());
             //String skipeds = JSON.toJSONString(skipedRows.get());
-            
+
             log.error(errors);
             //log.error(skipeds);
 
@@ -257,7 +260,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
         Map<Integer, List<String>> headers = mergeHead(headList);
 
         // 查询form相关信息
-        List<FormItem> customerItems = listFormItems("resi_base_info");
+        List<FormItem> customerItems = listFormItems(IMPORT_IC_RESI_FORM_CODE);
 
         // 清洗表头数据
         Map<Integer, String> abandonedHeaders = washHeaders(headers, customerItems);
@@ -306,7 +309,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
         Map<Integer, List<String>> headers = mergeHead(headList);
 
         // 查询form相关信息
-        List<FormItem> customerItems = listFormItems("resi_base_info");
+        List<FormItem> customerItems = listFormItems(IMPORT_IC_RESI_FORM_CODE);
 
         // 清洗表头数据
         Map<Integer, String> abandonedHeaders = washHeaders(headers, customerItems);
@@ -361,27 +364,34 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                 columnAndValues.put("AGENCY_ID", currUserAgencyId);
                 columnAndValues.put("PIDS", currUserAgencyPids);
                 columnAndValues.put("CUSTOMER_ID", loginUserUtil.getCurrentCustomerId());
-                columnAndValues.put("CREATED_BY", currentUserId);
+
                 columnAndValues.put("UPDATED_BY", currentUserId);
-                columnAndValues.put("ID", UUID.randomUUID().toString().replace("-", ""));
 
                 // 验证居民信息是否存在
                 String idCard = columnAndValues.get("ID_CARD");
                 LambdaQueryWrapper<IcResiUserEntity> idCardQuery = new LambdaQueryWrapper<>();
                 idCardQuery.eq(IcResiUserEntity::getIdCard, idCard);
+                IcResiUserEntity resiBaseInfo = icResiUserDao.selectOne(idCardQuery);
 
-                if (icResiUserDao.selectCount(idCardQuery) > 0) {
-                    //log.info("身份证号为【{}】的居民信息已存在，跳过导入", idCard);
-                    SkipedRow skipedRow = new SkipedRow();
-                    skipedRow.setName(columnAndValues.get("NAME"));
-                    skipedRow.setIdCard(idCard);
-                    skipedRow.setInfo("身份证号已存在，跳过导入");
-                    skipedRow.setTableName(tableName);
-                    skipedRows.get().get(IcResiUserTableEnums.IC_RESI_USER.getTableName()).add(skipedRow);
-                    continue;
+                if (resiBaseInfo != null) {
+                    icResiUserDao.upTable(tableName, resiBaseInfo.getId(), columnAndValues);
+                } else {
+                    columnAndValues.put("CREATED_BY", currentUserId);
+                    columnAndValues.put("ID", UUID.randomUUID().toString().replace("-", ""));
+                    icResiUserDao.add(tableName, columnAndValues);
                 }
 
-                icResiUserDao.add(tableName, columnAndValues);
+                //if (icResiUserDao.selectCount(idCardQuery) > 0) {
+                //    //log.info("身份证号为【{}】的居民信息已存在，跳过导入", idCard);
+                //    SkipedRow skipedRow = new SkipedRow();
+                //    skipedRow.setName(columnAndValues.get("NAME"));
+                //    skipedRow.setIdCard(idCard);
+                //    skipedRow.setInfo("身份证号已存在，跳过导入");
+                //    skipedRow.setTableName(tableName);
+                //    skipedRows.get().get(IcResiUserTableEnums.IC_RESI_USER.getTableName()).add(skipedRow);
+                //    continue;
+                //}
+
             } catch (Exception e) {
                 String errorMsg;
                 if (e instanceof RenException) {
@@ -416,7 +426,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                                         String currentUserId, String targetTableName, String customerId) {
 
         LinkedHashMap<String, String> columnAndValues = new LinkedHashMap<>();
-                
+
         // 遍历每一行，将行内容转化为
         for (Map<Integer, String> row : dataRows) {
 
@@ -440,32 +450,42 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
 
                 String icResiId = icResiUserBaseInfo.getId();
 
-                // 验证党员信息是否存在
-                if (CollectionUtils.isNotEmpty(icResiUserDao.selectSubTableRecords(customerId, icResiId, targetTableName))) {
-                    log.info("身份证号为【{}】的居民【{}】信息已存在，跳过导入", idCard, targetTableName);
-    
-                    SkipedRow skipedRow = new SkipedRow();
-                    skipedRow.setName(columnAndValues.get("NAME"));
-                    skipedRow.setIdCard(columnAndValues.get("ID_CARD"));
-                    skipedRow.setInfo("信息已存在，跳过导入");
-                    skipedRow.setTableName(targetTableName);
-                    skipedRows.get().get(targetTableName).add(skipedRow);
-                    
-                    continue;
-                }
+                //if (CollectionUtils.isNotEmpty(icResiUserDao.selectSubTableRecords(customerId, icResiId, targetTableName))) {
+                //    log.info("身份证号为【{}】的居民【{}】信息已存在，跳过导入", idCard, targetTableName);
+                //
+                //    SkipedRow skipedRow = new SkipedRow();
+                //    skipedRow.setName(columnAndValues.get("NAME"));
+                //    skipedRow.setIdCard(columnAndValues.get("ID_CARD"));
+                //    skipedRow.setInfo("信息已存在，跳过导入");
+                //    skipedRow.setTableName(targetTableName);
+                //    skipedRows.get().get(targetTableName).add(skipedRow);
+                //    
+                //    continue;
+                //}
 
                 columnAndValues.put("IC_RESI_USER", icResiId);
-
                 columnAndValues.put("CUSTOMER_ID", loginUserUtil.getCurrentCustomerId());
-                columnAndValues.put("CREATED_BY", currentUserId);
                 columnAndValues.put("UPDATED_BY", currentUserId);
-                columnAndValues.put("ID", UUID.randomUUID().toString().replace("-", ""));
 
+                // 移除excel中存在，但是数据库表中不存在的无效列，方式sql语法错误
                 columnAndValues = removeNeedlessColumns(columnAndValues);
 
-                icResiUserDao.add(targetTableName, columnAndValues);
-
+                // 更新主表的人员类型及更新时间
                 updateMainTableResiTypeFlag(Objects.requireNonNull(IcResiUserTableEnums.getObjectByTableName(targetTableName)), icResiId);
+
+                // 验证附加信息是否存在
+                List<Map<String, Object>> subInfos = icResiUserDao.selectSubTableRecords(customerId, icResiId, targetTableName);
+                if (CollectionUtils.isNotEmpty(subInfos)) {
+                    Map<String, Object> subInfo = subInfos.get(0);
+                    // 附加信息存在，更新附加表内容
+                    icResiUserDao.upTable(targetTableName, subInfo.get("ID").toString(), columnAndValues);
+                } else {
+                    // 新增附加表信息
+                    columnAndValues.put("CREATED_BY", currentUserId);
+                    columnAndValues.put("ID", UUID.randomUUID().toString().replace("-", ""));
+                    icResiUserDao.add(targetTableName, columnAndValues);
+                }
+
             } catch (Exception e) {
                 String errorMsg;
                 if (e instanceof RenException) {
@@ -474,7 +494,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                     errorMsg = "未知系统错误";
                     log.error(ExceptionUtils.getErrorStackTrace(e));
                 }
-                
+
                 ErrorRow errorRow = new ErrorRow();
                 errorRow.setName(columnAndValues.get("NAME"));
                 errorRow.setIdCard(columnAndValues.get("ID_CARD"));
@@ -517,13 +537,13 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
      * @param target 要将数据放到哪个对象中
      */
     private void convertColumnWrappers2Map4Persist(Map<String, ColumnWrapper> headerColumnWrapper, Map<Integer, String> row,
-                                                                            String currUserAgencyId, Map<Integer, String> checkBoxOptionColumnIdxAndLabel,
-                                                                            LinkedHashMap<String, String> target) {
+                                                   String currUserAgencyId, Map<Integer, String> checkBoxOptionColumnIdxAndLabel,
+                                                   LinkedHashMap<String, String> target) {
 
         boolean interupt = false;
-        
+
         List<String> errorColumnNames = new LinkedList<>();
-        
+
         for (Map.Entry<String, ColumnWrapper> columnWrapperEntry : headerColumnWrapper.entrySet()) {
 
             ColumnWrapper columnWrapper = columnWrapperEntry.getValue();
@@ -561,16 +581,16 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                 String checkBoxColValue = getCheckBoxColValue(columnWrapper, row, checkBoxOptionColumnIdxAndLabel);
                 columnWrapper.setColValue(checkBoxColValue);
             }
-            
+
             // requiredColumns中的值为必填项
             if (columnWrapper.getRequired() == 1 && StringUtils.isBlank(columnWrapper.colValue)) {
                 interupt = true;
                 errorColumnNames.add(columnWrapper.combinedLabel);
             }
-            
+
             target.put(columnWrapper.columnName, columnWrapper.colValue);
         }
-        
+
         if (interupt) {
             throw new RenException(String.join(",", errorColumnNames) + "的值未填写");
         }
@@ -654,7 +674,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
      * @return
      */
     private Map<String, ColumnWrapper> convertExcelHeaders2DBColumnWrappers(Map<String, FormItem> formItemMap, Map<String, List<Integer>> combinedHeaders,
-                                                                                                  List<Map<Integer, String>> datas, Map<Integer, String> abandonedHeaders) {
+                                                                            List<Map<Integer, String>> datas, Map<Integer, String> abandonedHeaders) {
 
 //        HashMap<String, List<ColumnWrapper>> tables = new HashMap<>();
         Map<String, ColumnWrapper> columns = new LinkedHashMap<>(combinedHeaders.size());
@@ -896,21 +916,21 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
      */
     public void downLoadResults(HttpServletResponse response) throws IOException {
         //public static final ThreadLocal<Map<String, List<ErrorRow>>> errorRows = new ThreadLocal<>();
-        
+
         String fileName = "导入失败条目清单.xls";
         response.setHeader("content-Type", "application/vnd.ms-excel");
         response.addHeader("Content-Disposition", "attachment;fileName=" + URLEncoder.encode(fileName, "UTF-8"));
-        
+
         LinkedList<ErrorRow> list = new LinkedList<>();
         for (Map.Entry<String, List<ErrorRow>> entry : errorRows.get().entrySet()) {
             list.addAll(entry.getValue());
         }
 
-        list.forEach(row -> row.setSheetName(IcResiUserTableEnums.getObjectByTableName(row.tableName).getTableComment()));
-        
+        list.forEach(row -> {System.out.println(row.getTableName());row.setSheetName(IcResiUserTableEnums.getObjectByTableName(row.tableName).getTableComment());});
+
         Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams("导入失败的条目列表","导入失败"),
                 ErrorRow.class, list);
-        
+
         workbook.write(response.getOutputStream());
     }
 }

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

@@ -43,6 +43,7 @@ import com.epmet.dao.IcResiUserDao;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.CustomerGridDTO;
 import com.epmet.dto.IcHouseDTO;
+import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.IcResiUserEntity;
@@ -545,11 +546,32 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         Integer no = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
         PageInfo<SearchByNameResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.searchByName(formDTO.getName(), staffInfo.getAgencyId(), no));
         List<SearchByNameResultDTO> result = pageInfo.getList();
-        // 查询小区，楼号，网格
-        // TODO
         if (CollectionUtils.isEmpty(result)){
             return new ArrayList<>();
         }
+        // 查询小区，楼号，网格
+        Result<List<AllGridsByUserIdResultDTO>> gridResult = govOrgOpenFeignClient.getGridListByGridIds(result.stream().map(SearchByNameResultDTO::getGridId).collect(Collectors.toList()));
+        if (!gridResult.success()) {
+            throw new RenException(gridResult.getCode(),gridResult.getMsg());
+        }
+        Map<String, String> gridMap = gridResult.getData().stream().collect(Collectors.toMap(AllGridsByUserIdResultDTO::getGridId, AllGridsByUserIdResultDTO::getGridName));
+        Result<List<IcNeighborHoodDTO>> neighborHoodResult = govOrgOpenFeignClient.getListByIds(result.stream().map(SearchByNameResultDTO::getNeighborHoodId).collect(Collectors.toList()));
+        if (!neighborHoodResult.success()) {
+            throw new RenException(neighborHoodResult.getCode(),neighborHoodResult.getMsg());
+        }
+        Map<String, String> neighborHoodMap = neighborHoodResult.getData().stream().collect(Collectors.toMap(IcNeighborHoodDTO::getId, IcNeighborHoodDTO::getNeighborHoodName));
+        Result<List<BuildingResultDTO>> buildResult = govOrgOpenFeignClient.buildingListByIds(result.stream().map(SearchByNameResultDTO::getBuildId).collect(Collectors.toList()));
+        if (!buildResult.success()) {
+            throw new RenException(buildResult.getCode(),buildResult.getMsg());
+        }
+        Map<String, String> buildMap = buildResult.getData().stream().collect(Collectors.toMap(BuildingResultDTO::getBuildingId, BuildingResultDTO::getBuildingName));
+
+        result.forEach(item -> {
+            item.setGridName(gridMap.get(item.getGridId()));
+            item.setNeighborHoodName(neighborHoodMap.get(item.getNeighborHoodId()));
+            item.setBuildNum(buildMap.get(item.getBuildId()));
+        });
+
         return result;
     }