From 8ad98afb53fbd472544536de24a2a24bdf56fd3b Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Wed, 2 Sep 2020 13:27:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E9=87=87?= =?UTF-8?q?=E9=9B=86-Excel=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/commons/tools/utils/ExcelUtils.java | 2 +- .../BasePopulationInformationExportDto.java | 121 +++++++++++++ .../dto/BaseResidentInformationExportDto.java | 47 +++++ .../HousingInformationController.java | 32 +++- .../esua/epdc/dao/HousingInformationDao.java | 20 +++ .../BasePopulationInformationExportExcel.java | 163 ++++++++++++++++++ .../BaseResidentInformationExportExcel.java | 56 ++++++ .../service/HouseBusinessInfoService.java | 4 +- .../service/HousingInformationService.java | 19 ++ .../impl/HouseBusinessInfoServiceImpl.java | 2 +- .../impl/HousingInformationServiceImpl.java | 39 ++++- .../PopulationInformationServiceImpl.java | 27 +++ .../mapper/HousingInformationDao.xml | 84 +++++++++ 13 files changed, 602 insertions(+), 14 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/BasePopulationInformationExportDto.java create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/BaseResidentInformationExportDto.java create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/BasePopulationInformationExportExcel.java create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/BaseResidentInformationExportExcel.java diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ExcelUtils.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ExcelUtils.java index 0a5cc997..e61df2d1 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ExcelUtils.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/ExcelUtils.java @@ -94,7 +94,7 @@ public class ExcelUtils { * @param sheetNames sheet名字列表 */ public static void exportExcelToTargetWithSheets(HttpServletResponse response, String fileName, List sheetNames, - List> targetClassList,List... sourceList) throws Exception { + List> targetClassList,Collection... sourceList) throws Exception { if(sheetNames.size()!=targetClassList.size() && targetClassList.size()!=sourceList.length){ throw new RenException("参数传递出错"); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/BasePopulationInformationExportDto.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/BasePopulationInformationExportDto.java new file mode 100644 index 00000000..6f8d142f --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/BasePopulationInformationExportDto.java @@ -0,0 +1,121 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dto; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 人口信息表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2020-08-19 + */ +@Data +public class BasePopulationInformationExportDto { + + private String id; + + private String gridName; + + private String houseAddress; + + private String buyingTime; + + private BigDecimal houseArea; + + private String propertyOwner; + + private String propertyOwnerIdentityNo; + + private String propertyOwnerCard; + + private String propertyOwnerMobile; + + private String houseUse; + + private String tenantName; + + private String tenantPhone; + + private String tenantIdentityNo; + + private String enterpriseName; + + private String socialUniformCode; + + private String legalRepresentative; + + private String enterprisePhone; + + private String residentsName; + + private String residentsSex; + + private String residentsBirthday; + + private String residentsNation; + + private String educationLevel; + + private String politicsStatus; + + private String joinTime; + + private String organizationalRelationshipLocation; + + private String residentsIdentityNo; + + private String residentsPhone; + + private String bodyStatus; + + private String maritalStatus; + + private String accountType; + + private String militaryService; + + private String householdRegistrationPlace; + + private String employmentStatus; + + private String currentEmployer; + + private String currentEmployerAddress; + + private String unemploymentReason; + + private String reemploymentPermit; + + private String unemploymentRegister; + + private String unemploymentRegisterTime; + + private String familyCategory; + + private String helpStatus; + + private Integer motorVehicleNum; + + private String motorVehicleCategory; + + private String dogStatus; + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/BaseResidentInformationExportDto.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/BaseResidentInformationExportDto.java new file mode 100644 index 00000000..e1e5fc2a --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/BaseResidentInformationExportDto.java @@ -0,0 +1,47 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dto; + +import lombok.Data; + +/** + * 人口信息表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2020-08-19 + */ +@Data +public class BaseResidentInformationExportDto { + + private String houseHeadName; + + private String residentsIdentityNo; + + private String houseHeadRelation; + + private String residentsName; + + private String residentsSex; + + private String residentsNation; + + private String currentEmployer; + + private String currentAddress; + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/HousingInformationController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/HousingInformationController.java index 1766b5d5..67a794ed 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/HousingInformationController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/HousingInformationController.java @@ -17,7 +17,9 @@ package com.elink.esua.epdc.controller; +import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.AssertUtils; @@ -25,10 +27,13 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; +import com.elink.esua.epdc.dto.BasePopulationInformationExportDto; +import com.elink.esua.epdc.dto.BaseResidentInformationExportDto; import com.elink.esua.epdc.dto.HousingInformationDTO; import com.elink.esua.epdc.excel.BasePopulationInformationExcel; +import com.elink.esua.epdc.excel.BasePopulationInformationExportExcel; import com.elink.esua.epdc.excel.BaseResidentInformationExcel; -import com.elink.esua.epdc.excel.HousingInformationExcel; +import com.elink.esua.epdc.excel.BaseResidentInformationExportExcel; import com.elink.esua.epdc.service.HousingInformationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -39,6 +44,8 @@ import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; /** @@ -90,8 +97,23 @@ public class HousingInformationController { @GetMapping("export") public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = housingInformationService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, HousingInformationExcel.class); + //查询房屋和人口信息 + List basePopulationInformationExcelList = housingInformationService.selectBasePopulationInformationExcelList(params); + if(basePopulationInformationExcelList == null || basePopulationInformationExcelList.size()==0){ + throw new RenException("数据为空"); + } + //根据获取的户主ID查询居住人信息 + Map> baseMap = basePopulationInformationExcelList.stream().collect(Collectors.groupingBy(BasePopulationInformationExportDto::getId)); + //获取所有的户主ID + Set houseHeadIds = baseMap.keySet(); + List baseResidentInformationExportDtoList = housingInformationService.selectBaseResidentInformationExcelList(houseHeadIds); + List> classes = new ArrayList<>(2); + classes.add(BasePopulationInformationExportExcel.class); + classes.add(BaseResidentInformationExportExcel.class); + List sheetNames = new ArrayList<>(2); + sheetNames.add("房屋信息和户主信息"); + sheetNames.add("居民信息"); + ExcelUtils.exportExcelToTargetWithSheets(response, "居民信息导出",sheetNames,classes, ConvertUtils.sourceToTarget(basePopulationInformationExcelList, BasePopulationInformationExportExcel.class),ConvertUtils.sourceToTarget(baseResidentInformationExportDtoList,BaseResidentInformationExportExcel.class)); } /** @@ -117,8 +139,8 @@ public class HousingInformationController { **/ @GetMapping("exportModule") public void exportModule(@RequestParam Map params, HttpServletResponse response) throws Exception { - List basePopulationInformationExcels = new ArrayList<>(1); - List baseResidentInformationExcels = new ArrayList<>(1); + List basePopulationInformationExcels = new ArrayList<>(1); + List baseResidentInformationExcels = new ArrayList<>(1); BasePopulationInformationExcel basePopulationInformationExcel = new BasePopulationInformationExcel(); basePopulationInformationExcel.setHouseAddress("XX家园XX号楼XX单元XXX"); basePopulationInformationExcel.setBuyingTime("2020-02-02"); diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/HousingInformationDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/HousingInformationDao.java index 9f6af490..b0a6557b 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/HousingInformationDao.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/HousingInformationDao.java @@ -18,12 +18,16 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.BasePopulationInformationExportDto; +import com.elink.esua.epdc.dto.BaseResidentInformationExportDto; import com.elink.esua.epdc.dto.HousingInformationDTO; import com.elink.esua.epdc.entity.HousingInformationEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; +import java.util.Set; /** * 房屋信息表 @@ -49,4 +53,20 @@ public interface HousingInformationDao extends BaseDao * @return com.elink.esua.epdc.dto.HousingInformationDTO **/ HousingInformationDTO selectByIdAndUsed(Map params); + /** + * @Description 查询导出的 房屋信息和户主信息 + * @Author songyunpeng + * @Date 2020/9/1 + * @Param [params] + * @return java.util.List + **/ + List selectBasePopulationInformationExcelList(Map params); + /** + * @Description 根据户主ID列表获取居住人信息 + * @Author songyunpeng + * @Date 2020/9/1 + * @Param [houseHeadIds] + * @return java.util.List + **/ + List selectBaseResidentInformationExcelList(@Param("houseHeadIds") Set houseHeadIds); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/BasePopulationInformationExportExcel.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/BasePopulationInformationExportExcel.java new file mode 100644 index 00000000..d69ae7d7 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/BasePopulationInformationExportExcel.java @@ -0,0 +1,163 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 人口信息表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2020-08-19 + */ +@Data +public class BasePopulationInformationExportExcel { + + @Excel(name = "所属网格") + private String gridName; + + @Excel(name = "房屋地址") + private String houseAddress; + + @Excel(name = "购房时间") + private String buyingTime; + + @Excel(name = "房屋面积") + private BigDecimal houseArea; + + @Excel(name = "产权人姓名") + private String propertyOwner; + + @Excel(name = "产权人身份证号") + private String propertyOwnerIdentityNo; + + @Excel(name = "产权证") + private String propertyOwnerCard; + + @Excel(name = "产权人联系电话") + private String propertyOwnerMobile; + + @Excel(name = "房屋用途",replace = {"自住_0","租赁_1","经营_2"}) + private String houseUse; + + @Excel(name = "承租人姓名") + private String tenantName; + + @Excel(name = "承租人电话") + private String tenantPhone; + + @Excel(name = "承租人身份证号") + private String tenantIdentityNo; + + @Excel(name = "企业名称") + private String enterpriseName; + + @Excel(name = "社会统一代码") + private String socialUniformCode; + + @Excel(name = "法人代表") + private String legalRepresentative; + + @Excel(name = "电话") + private String enterprisePhone; + + @Excel(name = "户主姓名") + private String residentsName; + + @Excel(name = "性别",replace = {"女_0","男_1"}) + private String residentsSex; + + @Excel(name = "出生年月") + private String residentsBirthday; + + @Excel(name = "民族") + private String residentsNation; + + @Excel(name = "文化程度") + private String educationLevel; + + @Excel(name = "政治面貌",replace = {"群众_0","党员_1"}) + private String politicsStatus; + + @Excel(name = "入党时间") + private String joinTime; + + @Excel(name = "组织关系所在地") + private String organizationalRelationshipLocation; + + @Excel(name = "身份证号码") + private String residentsIdentityNo; + + @Excel(name = "户主联系电话") + private String residentsPhone; + + @Excel(name = "身体状况",replace = {"病残_0","健康_1"}) + private String bodyStatus; + + @Excel(name = "婚姻状况",replace = {"未婚_0","已婚_1"}) + private String maritalStatus; + + @Excel(name = "户口类型",replace = {"城镇_0","农业_1"}) + private String accountType; + + @Excel(name = "服兵役",replace = {"否_0","是_1"}) + private String militaryService; + + @Excel(name = "户籍地") + private String householdRegistrationPlace; + + @Excel(name = "就业情况",replace = {"在岗_0","失业_1"}) + private String employmentStatus; + + @Excel(name = "现工作单位") + private String currentEmployer; + + @Excel(name = "现单位地址") + private String currentEmployerAddress; + + @Excel(name = "失业原因",replace = {"原单位破产_0","解除合同_1","效益不好_2","减员_3","其他_4"}) + private String unemploymentReason; + + @Excel(name = "再就业优惠证",replace = {"无_0","有_1"}) + private String reemploymentPermit; + + @Excel(name = "失业登记",replace = {"否_0","是_1"}) + private String unemploymentRegister; + + @Excel(name = "失业登记时间") + private String unemploymentRegisterTime; + + @Excel(name = "家庭类别",replace = {"普通家庭_0","军烈_2","优抚_3","困难家庭_6"}) + private String familyCategory; + + @Excel(name = "救助情况",replace = {"低保_0","大病_1","廉租_2","教育_3","临时_4","其他_5"}) + private String helpStatus; + + @Excel(name = "机动车数量") + private Integer motorVehicleNum; + + @Excel(name = "机动车类型",replace = {"轿车_0","摩托_1","其他_2"}) + private String motorVehicleCategory; + + @Excel(name = "宠物犬状况",replace = {"无_0","有_1"}) + private String dogStatus; + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/BaseResidentInformationExportExcel.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/BaseResidentInformationExportExcel.java new file mode 100644 index 00000000..59d6ce21 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/excel/BaseResidentInformationExportExcel.java @@ -0,0 +1,56 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +/** + * 人口信息表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2020-08-19 + */ +@Data +public class BaseResidentInformationExportExcel { + + @Excel(name = "户主身份证号码") + private String residentsIdentityNo; + + @Excel(name = "户主姓名") + private String houseHeadName; + + @Excel(name = "与户主关系",replace = {"子女_0","夫妻_1","其他_2","父母_3"}) + private String houseHeadRelation; + + @Excel(name = "居住人姓名") + private String residentsName; + + @Excel(name = "性别",replace = {"女_0","男_1"}) + private String residentsSex; + + @Excel(name = "民族") + private String residentsNation; + + @Excel(name = "现工作单位") + private String currentEmployer; + + @Excel(name = "现居住地") + private String currentAddress; + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/HouseBusinessInfoService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/HouseBusinessInfoService.java index c4fc6c8c..7780d519 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/HouseBusinessInfoService.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/HouseBusinessInfoService.java @@ -94,13 +94,13 @@ public interface HouseBusinessInfoService extends BaseService + **/ + List selectBasePopulationInformationExcelList(Map params); + /** + * @Description 根据户主ID列表获取居住人信息 + * @Author songyunpeng + * @Date 2020/9/1 + * @Param [houseHeadIds] + * @return java.util.List + **/ + List selectBaseResidentInformationExcelList(Set houseHeadIds); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/HouseBusinessInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/HouseBusinessInfoServiceImpl.java index 23698d63..8171cce8 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/HouseBusinessInfoServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/HouseBusinessInfoServiceImpl.java @@ -101,7 +101,7 @@ public class HouseBusinessInfoServiceImpl extends BaseServiceImpl params = new HashMap<>(); params.put("HOUSE_ID", houseID); List houseBusinessInfoEntities = baseDao.selectByMap(params); diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/HousingInformationServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/HousingInformationServiceImpl.java index 16f0b241..f4e6a9c8 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/HousingInformationServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/HousingInformationServiceImpl.java @@ -35,10 +35,7 @@ import com.elink.esua.epdc.constant.HouseUseConstant; import com.elink.esua.epdc.constant.PopulationDictConstant; import com.elink.esua.epdc.dao.HouseResidentDao; import com.elink.esua.epdc.dao.HousingInformationDao; -import com.elink.esua.epdc.dto.HousingInformationDTO; -import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; -import com.elink.esua.epdc.dto.SysPopulationSimpleDictDTO; -import com.elink.esua.epdc.dto.SysSimpleDictDTO; +import com.elink.esua.epdc.dto.*; import com.elink.esua.epdc.dto.epdc.form.SysPopulationSimpleDictFormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcPopulationErrorResultDTO; import com.elink.esua.epdc.entity.*; @@ -193,6 +190,11 @@ public class HousingInformationServiceImpl extends BaseServiceImpl selectBasePopulationInformationExcelList(Map params) { + return baseDao.selectBasePopulationInformationExcelList(params); + } + + @Override + public List selectBaseResidentInformationExcelList(Set houseHeadIds) { + return baseDao.selectBaseResidentInformationExcelList(houseHeadIds); + } + /** * @Description 校验完成后插入居民信息 * @Author songyunpeng diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PopulationInformationServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PopulationInformationServiceImpl.java index 2ad4f10d..14236365 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PopulationInformationServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PopulationInformationServiceImpl.java @@ -17,6 +17,7 @@ package com.elink.esua.epdc.service.impl; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; @@ -143,6 +144,19 @@ public class PopulationInformationServiceImpl extends BaseServiceImpl where t.DEL_FLAG ='0' and t.ID = #{id} + + \ No newline at end of file