From 2b7422da3347acefea79b26fe102425f2693a12b Mon Sep 17 00:00:00 2001 From: lzh Date: Mon, 1 Nov 2021 15:50:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=EF=BC=8C=E6=A5=BC=E5=AE=87?= =?UTF-8?q?=EF=BC=8C=E6=88=BF=E5=B1=8B=E7=AE=A1=E7=90=86=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=9F=A5=E8=AF=A2=EF=BC=8C?= =?UTF-8?q?=E5=88=A0=E9=99=A4=EF=BC=8C=E5=AF=BC=E5=85=A5=EF=BC=8C=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/BuildingTreeLevelDTO.java | 3 + .../com/epmet/dto/form/IcBulidingFormDTO.java | 5 +- .../com/epmet/dto/form/IcHouseFormDTO.java | 2 +- .../dto/result/IcNeighborHoodResultDTO.java | 4 +- .../com/epmet/enums/BuildingTypeEnums.java | 57 +++++++++++++++++ .../com/epmet/enums/HousePurposeEnums.java | 59 ++++++++++++++++++ .../com/epmet/enums/HouseRentFlagEnums.java | 58 +++++++++++++++++ .../java/com/epmet/enums/HouseTypeEnums.java | 54 ++++++++++++++++ .../epmet/controller/BuildingController.java | 15 +++++ .../java/com/epmet/excel/IcBuildingExcel.java | 4 ++ .../service/impl/BuildingServiceImpl.java | 35 +++++++++-- .../epmet/service/impl/HouseServiceImpl.java | 30 ++++++--- .../service/impl/NeighborHoodServiceImpl.java | 2 +- .../main/resources/excel/building_export.xlsx | Bin 12531 -> 12629 bytes .../resources/excel/building_template.xlsx | Bin 11756 -> 12353 bytes .../main/resources/excel/house_template.xlsx | Bin 11445 -> 11451 bytes .../main/resources/mapper/IcBuildingDao.xml | 16 ++--- .../src/main/resources/mapper/IcHouseDao.xml | 19 +++--- 18 files changed, 327 insertions(+), 36 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/BuildingTypeEnums.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HousePurposeEnums.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseRentFlagEnums.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseTypeEnums.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/BuildingTreeLevelDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/BuildingTreeLevelDTO.java index 3d7da25047..4ffa533faf 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/BuildingTreeLevelDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/BuildingTreeLevelDTO.java @@ -47,6 +47,9 @@ public class BuildingTreeLevelDTO implements Serializable { private List children; + private String longitude; + private String latitude; + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBulidingFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBulidingFormDTO.java index 592c5a4776..8ce4e063b9 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBulidingFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBulidingFormDTO.java @@ -42,14 +42,14 @@ public class IcBulidingFormDTO implements Serializable { /** * 组织id */ - @NotBlank(message = "组织id不能为空", groups = {AddGroup.class}) + @NotBlank(message = "组织id不能为空", groups = {AddGroup.class, UpdateGroup.class}) private String agencyId; /** * 网格id */ - + @NotBlank(message = "网格不能为空", groups = {AddGroup.class, UpdateGroup.class}) private String gridId; @@ -69,6 +69,7 @@ public class IcBulidingFormDTO implements Serializable { /** * 楼栋类型 */ + @NotBlank(message = "楼栋类型不能为空", groups = {AddGroup.class, UpdateGroup.class}) private String type=""; /** diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java index 2f28b22eee..cb557aa572 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java @@ -45,7 +45,7 @@ public class IcHouseFormDTO implements Serializable { @NotBlank(message = "小区id不能为空", groups = {AddGroup.class, UpdateGroup.class}) private String neighborHoodId; - @NotBlank(message = "所属楼栋ID不能为空", groups = { UpdateGroup.class}) + @NotBlank(message = "所属楼栋ID不能为空", groups = {AddGroup.class, UpdateGroup.class}) private String buildingId; /** diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcNeighborHoodResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcNeighborHoodResultDTO.java index ca53315d02..51b410eaa5 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcNeighborHoodResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcNeighborHoodResultDTO.java @@ -1,6 +1,5 @@ package com.epmet.dto.result; -import lombok.AllArgsConstructor; import lombok.Data; import java.io.Serializable; @@ -20,7 +19,8 @@ public class IcNeighborHoodResultDTO implements Serializable { /** * 总条数 * */ - private Long total; + + private Integer total; // /** // * 数据类型【小区：neighbourHood，楼栋：building，房屋：house】 diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/BuildingTypeEnums.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/BuildingTypeEnums.java new file mode 100644 index 0000000000..f1d636a571 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/BuildingTypeEnums.java @@ -0,0 +1,57 @@ +package com.epmet.enums; + +import org.springframework.util.StringUtils; + +public enum BuildingTypeEnums { + SPF("1","商品房"), + ZJF("2","自建房"), + BS("3","别墅"); + + private String key; + private String value; + + BuildingTypeEnums(String key, String value) { + this.key = key; + this.value=value; + } + + + public static String getTypeValue(Object key){ + if(null == key){ + return null; + } + BuildingTypeEnums buildingTypeEnums = getBuildType(String.valueOf(key)); + return buildingTypeEnums == null ? null : buildingTypeEnums.getValue(); + } + + + public static String getKeyByValue(String value){ + if(StringUtils.isEmpty(value)){ + return ""; + } + for (BuildingTypeEnums e : BuildingTypeEnums.values()) { + if (e.getValue().equals(value)) { + return e.getKey(); + } + } + return ""; + } + + + private static BuildingTypeEnums getBuildType(String key) { + for (BuildingTypeEnums b :BuildingTypeEnums.values()) { + if (b.getKey().equals(key)) { + return b; + } + } + return null; + } + + public String getValue() { + return value; + } + + public String getKey() { + return key; + } +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HousePurposeEnums.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HousePurposeEnums.java new file mode 100644 index 0000000000..e1a2a14869 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HousePurposeEnums.java @@ -0,0 +1,59 @@ +package com.epmet.enums; + +import org.springframework.util.StringUtils; + +public enum HousePurposeEnums { + ZZ("1","住宅"), + SY("2","商业"), + BG("3","办公"), + GY("4","工业"), + CC("5","仓储"), + SZHY("6","商住混用"), + QT("7","其他"); + + + private String key; + private String value; + + HousePurposeEnums(String key, String value) { + this.key = key; + this.value=value; + } + + public static String getKeyByValue(String value){ + if(StringUtils.isEmpty(value)){ + return ""; + } + for (HousePurposeEnums e : HousePurposeEnums.values()) { + if (e.getValue().equals(value)) { + return e.getKey(); + } + } + return ""; + } + + public static String getTypeValue(Object key){ + if(null == key){ + return null; + } + HousePurposeEnums buildingTypeEnums = getValueByKey(String.valueOf(key)); + return buildingTypeEnums == null ? null : buildingTypeEnums.getValue(); + } + + private static HousePurposeEnums getValueByKey(String key) { + for (HousePurposeEnums b : HousePurposeEnums.values()) { + if (b.getKey().equals(key)) { + return b; + } + } + return null; + } + + public String getValue() { + return value; + } + + public String getKey() { + return key; + } +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseRentFlagEnums.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseRentFlagEnums.java new file mode 100644 index 0000000000..618be0ea9a --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseRentFlagEnums.java @@ -0,0 +1,58 @@ +package com.epmet.enums; + +import org.springframework.util.StringUtils; + +public enum HouseRentFlagEnums { + YES(1,"是"), + NO(0,"否"); + + + + private Integer code; + private String name; + + + HouseRentFlagEnums(Integer code, String name) { + this.code = code; + this.name=name; + } + + + public static String getTypeValue(Object code){ + if(code == null){ + return null; + } + HouseRentFlagEnums houseRentFlagEnums = getByKey(Integer.parseInt(code.toString())); + return houseRentFlagEnums == null ? null : houseRentFlagEnums.getName(); + } + + private static HouseRentFlagEnums getByKey(Integer code) { + for (HouseRentFlagEnums e : HouseRentFlagEnums.values()) { + if (e.getCode().equals(code)) { + return e; + } + } + return null; + } + + public static Integer getCodeByName(String name){ + if(StringUtils.isEmpty(name)){ + return 0; + } + for (HouseRentFlagEnums e : HouseRentFlagEnums.values()) { + if (e.getName().equals(name)) { + return e.getCode(); + } + } + return 0; + } + + + public Integer getCode() { + return code; + } + + public String getName() { + return name; + } +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseTypeEnums.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseTypeEnums.java new file mode 100644 index 0000000000..821f3ccca7 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseTypeEnums.java @@ -0,0 +1,54 @@ +package com.epmet.enums; + +import org.springframework.util.StringUtils; + +public enum HouseTypeEnums { + SPF("1","楼房"), + ZJF("2","平房"), + BS("3","别墅"); + + private String key; + private String value; + + HouseTypeEnums(String key, String value) { + this.key = key; + this.value=value; + } + + public static String getKeyByValue(String value){ + if(StringUtils.isEmpty(value)){ + return ""; + } + for (HouseTypeEnums e : HouseTypeEnums.values()) { + if (e.getValue().equals(value)) { + return e.getKey(); + } + } + return ""; + } + + public static String getTypeValue(Object key){ + if(null == key){ + return null; + } + HouseTypeEnums buildingTypeEnums = getByKey(String.valueOf(key)); + return buildingTypeEnums == null ? null : buildingTypeEnums.getValue(); + } + + private static HouseTypeEnums getByKey(String key) { + for (HouseTypeEnums b : HouseTypeEnums.values()) { + if (b.getKey().equals(key)) { + return b; + } + } + return null; + } + + public String getValue() { + return value; + } + + public String getKey() { + return key; + } +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java index 81fccb5087..fa78b6f791 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java @@ -152,6 +152,21 @@ public class BuildingController { } + /** + * 导出 + * @param formDTO + * @param response + * @throws Exception + */ + @GetMapping("export") + public void export(HttpServletResponse response) throws Exception { + ListIcNeighborHoodFormDTO formDTO = new ListIcNeighborHoodFormDTO(); + ValidatorUtils.validateEntity(ListIcNeighborHoodFormDTO.class); + buildingService.exportBuildinginfo(formDTO,response); + + } + + /** * 导入数据 * @param file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcBuildingExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcBuildingExcel.java index d29a14942e..fbb0f28254 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcBuildingExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcBuildingExcel.java @@ -109,6 +109,10 @@ public class IcBuildingExcel extends ExcelVerifyInfo implements Serializable { @NotBlank(message = "楼栋名称不能位空") private String buildingName; + @Excel(name = "楼栋类型") + @NotBlank(message = "楼栋类型不能位空") + private String type; + @Excel(name = "单元数") @NotNull(message = "单元数不能位空") private Integer totalUnitNum; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index d6b989fbd0..7842454149 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -14,6 +14,7 @@ import com.epmet.dto.form.ListIcNeighborHoodFormDTO; import com.epmet.dto.result.ExtStaffPermissionResultDTO; import com.epmet.dto.result.IcNeighborHoodResultDTO; import com.epmet.entity.*; +import com.epmet.enums.BuildingTypeEnums; import com.epmet.excel.IcBuildingExcel; import com.epmet.excel.IcNeighborHoodExcel; import com.epmet.service.*; @@ -90,6 +91,9 @@ public class BuildingServiceImpl implements BuildingService { log.error("com.epmet.service.impl.BuildingServiceImpl.treeList，没有找到工作人员所属的机关信息，用户Id：{}",staffId); return new ArrayList<>(); } + +// agency = new CustomerStaffAgencyDTO(); +// agency.setAgencyId("77f6bc7f07064bf4c09ef848139a344c"); //1.获取所在组织及下级组织 CustomerAgencyEntity customerAgency = customerAgencyDao.selectById(agency.getAgencyId()); List customerAgencyList = icBuildingDao.selectAgencyChildrenList(agency.getAgencyId()); @@ -105,6 +109,8 @@ public class BuildingServiceImpl implements BuildingService { buildingTreeLevelDTO.setPId(item.getPid()); buildingTreeLevelDTO.setLabel(item.getOrganizationName()); buildingTreeLevelDTO.setLevel(item.getLevel()); + buildingTreeLevelDTO.setLongitude(item.getLongitude()); + buildingTreeLevelDTO.setLatitude(item.getLatitude()); buildingTreeLevelDTO.setChildren(new ArrayList<>()); return buildingTreeLevelDTO; }).collect(Collectors.toList()); @@ -126,6 +132,8 @@ public class BuildingServiceImpl implements BuildingService { buildingTreeLevelDTO.setLabel(item.getGridName()); buildingTreeLevelDTO.setLevel("grid"); buildingTreeLevelDTO.setPId(item.getPid()); + buildingTreeLevelDTO.setLongitude(item.getLongitude()); + buildingTreeLevelDTO.setLatitude(item.getLatitude()); buildingTreeLevelDTO.setChildren(new ArrayList<>()); return buildingTreeLevelDTO; }).collect(Collectors.toList()); @@ -134,7 +142,7 @@ public class BuildingServiceImpl implements BuildingService { //3.获取网格下的所有小区 List gridIdList = customerGridList.stream().map(a->a.getId()).collect(Collectors.toList()); List icNeighborHoodList = icNeighborHoodDao.selectList(new QueryWrapper().lambda().in(IcNeighborHoodEntity::getGridId, gridIdList)); - if(CollectionUtils.isEmpty(customerGridList)){ + if(CollectionUtils.isEmpty(icNeighborHoodList)){ agencyList.addAll(gridList); return covertToTree(customerAgency,agencyList); } @@ -144,6 +152,8 @@ public class BuildingServiceImpl implements BuildingService { buildingTreeLevelDTO.setPId(item.getGridId()); buildingTreeLevelDTO.setLabel(item.getNeighborHoodName()); buildingTreeLevelDTO.setLevel("neighbourHood"); + buildingTreeLevelDTO.setLongitude(item.getLongitude()); + buildingTreeLevelDTO.setLatitude(item.getLatitude()); buildingTreeLevelDTO.setChildren(new ArrayList<>()); return buildingTreeLevelDTO; }).collect(Collectors.toList()); @@ -165,6 +175,8 @@ public class BuildingServiceImpl implements BuildingService { buildingTreeLevelDTO.setPId(item.getNeighborHoodId()); buildingTreeLevelDTO.setLabel(item.getBuildingName()); buildingTreeLevelDTO.setLevel("building"); + buildingTreeLevelDTO.setLongitude(item.getLongitude()); + buildingTreeLevelDTO.setLatitude(item.getLatitude()); buildingTreeLevelDTO.setChildren(new ArrayList<>()); return buildingTreeLevelDTO; }).collect(Collectors.toList()); @@ -215,7 +227,7 @@ public class BuildingServiceImpl implements BuildingService { entity.setCustomerId(customerId); entity.setNeighborHoodId(Optional.ofNullable(neighborHoodMap.get(icBuildingExcel.getNeighborHoodName())).map(u->u.getId()).orElse(""));//neighborHoodMap.get(icBuildingExcel.getNeighborHoodName()).getId() entity.setBuildingName(icBuildingExcel.getBuildingName()); - entity.setType(""); + entity.setType(BuildingTypeEnums.getKeyByValue(icBuildingExcel.getType())); entity.setSort(0); entity.setTotalUnitNum(icBuildingExcel.getTotalUnitNum()); entity.setTotalFloorNum(icBuildingExcel.getTotalFloorNum()); @@ -247,7 +259,7 @@ public class BuildingServiceImpl implements BuildingService { IcNeighborHoodResultDTO result = new IcNeighborHoodResultDTO(); IPage> resultMap = searchBuilding(formDTO); - result.setTotal(resultMap.getTotal()); + result.setTotal(Long.valueOf(resultMap.getTotal()).intValue()); result.setList(resultMap.getRecords()); return result; } @@ -260,7 +272,7 @@ public class BuildingServiceImpl implements BuildingService { TemplateExportParams templatePath = new TemplateExportParams("excel/building_export.xlsx"); Map map = new HashMap<>(); map.put("maplist",icBuildingExcels); - ExcelPoiUtils.exportExcel(templatePath ,new HashMap<>(),"楼宇信息录入表",response); + ExcelPoiUtils.exportExcel(templatePath ,map,"楼宇信息录入表",response); return ; } private List searchAllBuilding(ListIcNeighborHoodFormDTO formDTO) { @@ -281,7 +293,11 @@ public class BuildingServiceImpl implements BuildingService { IcBuildingEntity building = ConvertUtils.sourceToTarget(formDTO, IcBuildingEntity.class); building.setDelFlag("0"); IcHouseEntity house = ConvertUtils.sourceToTarget(formDTO, IcHouseEntity.class); - return icBuildingDao.searchAllBuilding(building,house); + List icBuildingExcels = icBuildingDao.searchAllBuilding(building, house); + icBuildingExcels.forEach(item->{ + item.setType(BuildingTypeEnums.getTypeValue(item.getType())); + }); + return icBuildingExcels; } private IPage> searchBuilding(ListIcNeighborHoodFormDTO formDTO) { @@ -307,7 +323,12 @@ public class BuildingServiceImpl implements BuildingService { // .like(!StringUtils.isEmpty(formDTO.getBuildingName()),IcBuildingEntity::getBuildingName,formDTO.getBuildingName()); // buildingEntityQueryWrapper.eq("a.DEL_FLAG","0"); IcHouseEntity house = ConvertUtils.sourceToTarget(formDTO, IcHouseEntity.class); - return icBuildingDao.searchBuildingByPage(page,building,house); + IPage> mapIPage = icBuildingDao.searchBuildingByPage(page, building, house); + List> records = mapIPage.getRecords(); + records.forEach(item->{ + item.put("buildingType", BuildingTypeEnums.getTypeValue(item.get("buildingTypeKey"))); + }); + return mapIPage; } @@ -316,6 +337,8 @@ public class BuildingServiceImpl implements BuildingService { buildingTreeLevelDTO.setId(customerAgency.getId()); buildingTreeLevelDTO.setLabel(customerAgency.getOrganizationName()); buildingTreeLevelDTO.setLevel(customerAgency.getLevel()); + buildingTreeLevelDTO.setLongitude(customerAgency.getLongitude()); + buildingTreeLevelDTO.setLatitude(customerAgency.getLatitude()); buildingTreeLevelDTO.setChildren(new ArrayList<>()); recursionCovertToTree(buildingTreeLevelDTO,agencyList); List result = new ArrayList<>(); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index ce495c0ebc..e84a4fc01b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -3,6 +3,7 @@ package com.epmet.service.impl; import cn.afterturn.easypoi.excel.entity.TemplateExportParams; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.epmet.commons.tools.enums.HouseTypeEnum; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.IcBuildingDao; import com.epmet.dao.IcBuildingUnitDao; @@ -17,6 +18,9 @@ import com.epmet.dto.result.IcNeighborHoodResultDTO; import com.epmet.entity.IcBuildingEntity; import com.epmet.entity.IcHouseEntity; import com.epmet.entity.IcNeighborHoodEntity; +import com.epmet.enums.HousePurposeEnums; +import com.epmet.enums.HouseRentFlagEnums; +import com.epmet.enums.HouseTypeEnums; import com.epmet.excel.IcHouseExcel; import com.epmet.service.HouseService; import com.epmet.service.IcBuildingService; @@ -143,9 +147,9 @@ public class HouseServiceImpl implements HouseService { entity.setHouseName(icHouseExcel.getBuildingName()+"-"+icHouseExcel.getBuildingUnit()+"-"+icHouseExcel.getDoorName()); entity.setDoorName(icHouseExcel.getDoorName()); - entity.setHouseType(icHouseExcel.getHouseType()); - entity.setPurpose(icHouseExcel.getPurpose()); - entity.setRentFlag("是".equals(icHouseExcel.getRentFlag())?1:0); + entity.setHouseType(HouseTypeEnums.getKeyByValue(icHouseExcel.getHouseType())); + entity.setPurpose(HousePurposeEnums.getKeyByValue(icHouseExcel.getPurpose())); + entity.setRentFlag(HouseRentFlagEnums.getCodeByName(icHouseExcel.getRentFlag())); entity.setOwnerName(icHouseExcel.getOwnerName()); entity.setOwnerPhone(icHouseExcel.getOwnerPhone()); entity.setOwnerIdCard(icHouseExcel.getOwnerIdCard()); @@ -161,7 +165,7 @@ public class HouseServiceImpl implements HouseService { IcNeighborHoodResultDTO result = new IcNeighborHoodResultDTO(); //如果类型是house 查房屋 IPage> resultMap = searchHouse(formDTO); - result.setTotal(resultMap.getTotal()); + result.setTotal(Long.valueOf(resultMap.getTotal()).intValue()); result.setList(resultMap.getRecords()); return result; } @@ -175,7 +179,7 @@ public class HouseServiceImpl implements HouseService { TemplateExportParams templatePath = new TemplateExportParams("excel/house_export.xlsx"); Map map = new HashMap<>(); map.put("maplist",icHouseExcels); - ExcelPoiUtils.exportExcel(templatePath ,new HashMap<>(),"房屋信息录入表",response); + ExcelPoiUtils.exportExcel(templatePath ,map,"房屋信息录入表",response); return ; } @@ -189,7 +193,12 @@ public class HouseServiceImpl implements HouseService { IcHouseEntity house = ConvertUtils.sourceToTarget(formDTO, IcHouseEntity.class); house.setDelFlag("0"); - return icHouseDao.searchAllHouse(house); + List icHouseExcels = icHouseDao.searchAllHouse(house); + icHouseExcels.forEach(item->{ + item.setHouseType(HouseTypeEnums.getTypeValue(item.getHouseType())); + item.setPurpose(HousePurposeEnums.getTypeValue(item.getPurpose())); + }); + return icHouseExcels; } private IPage> searchHouse(ListIcNeighborHoodFormDTO formDTO) { @@ -220,7 +229,14 @@ public class HouseServiceImpl implements HouseService { IcHouseEntity house = ConvertUtils.sourceToTarget(formDTO, IcHouseEntity.class); house.setDelFlag("0"); - return icHouseDao.searchHouseByPage(page,house); + IPage> mapIPage = icHouseDao.searchHouseByPage(page, house); + List> records = mapIPage.getRecords(); + records.forEach(item->{ + item.put("houseType", HouseTypeEnums.getTypeValue(item.get("houseTypeKey"))); +// item.put("rentFlag", HouseRentFlagEnums.getTypeValue(item.get("rentFlagKey") )); + item.put("purpose", HousePurposeEnums.getTypeValue(item.get("purposeKey"))); + }); + return mapIPage; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java index dc96ce0dd8..2d41fdc8fb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java @@ -111,7 +111,7 @@ public class NeighborHoodServiceImpl implements NeighborHoodService { IcNeighborHoodResultDTO result = new IcNeighborHoodResultDTO(); IPage> resultMap = searchNeighborhood(formDTO); - result.setTotal(resultMap.getTotal()); + result.setTotal(Long.valueOf(resultMap.getTotal()).intValue()); result.setList(resultMap.getRecords()); return result; diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/building_export.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/building_export.xlsx index 2e2fbd53a4687a1b712d03e47607025fb7c5c251..226101af0a2ee33947c5e1074963f20a26a2f1c5 100644 GIT binary patch delta 4328 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 Srb=R!` diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/building_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/building_template.xlsx index 1334d9dcd9725eb8aa7068115831d8d29f884b95..7950169c04a51b0d75d1b1c4d06aabb044c941b6 100644 GIT binary patch delta 5303 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 delta 4689 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 diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_template.xlsx index a095e3e0f5fcc4b93eaf764066d069a9bb5c9889..26ced342a16a611060d265a91c1c154b4a435739 100644 GIT binary patch delta 1838 zcmV+}2hsSoS-V-V?FN5Sx^{f&0ssKi1^@sL0001ZY%h0ja%*C5Z)+}iZEU1f-*4J5 z5PqMu{~_{wnivvFBSOWX)sVKSTDSHkQsp{^SU7fOJ3v+Sf8RNf(3U-PZ3O<2yL|cX z{M}`AzAc5fX4-HiQ-n`KP?m#pX!~%U&@XEAkC4CEAN%X3&e5%R{Anv)~_MrhqUP+VrQYuaE1%$oD zvA5Om8^9ljF!X=gH-YKsRVAld8MUw{03GZ|AH|Qu0OJ=a*dFKLZAej|*_yjE>{#i+ zJ6R1ntib^chaX16Agx9#2_)~GXmQ7_hsL7?7wl#yU5`}N4^q05637$8*o&N7mZ#_x zwray(+|YIPrRD;xy(sF3C>VEgzS5p4)MhSM6DgH#gq44y#sw5H5teC5ESoB6L4f;! zJ}S2H2(YJx0%?0c*`Jzg1{DRuf*@feG$HrqirB)dwMfw{$z1iBicpp@!R5+-wy#QN zeJWI)`#D?Rae7xleYir**ul16mnyFX%a&^GLy5MtZ}X2^n0T7_R(?ZJ9J`v#|cP1bPcpsak~66SEIxPK?9 zPVn91w_N6GlOi8Oe?;CxyC1}^ zd^U~smglwr>Biw%+}``j__6@X7)S0os4zz@MK37Lc9bsR^4;))Qt*sZ)1!e~GkdbB zt83S{F?Iqf?3Uo8q!JY&F0Ferl91$6RF)ny*Y@CzZj@uv*hVLu&9T4|1 zCZ}$!IIF6ws4L~7YI?XPcpRgEaRG0VR()-J1Evfhf8~MzemJj+qgvrUydiZeiH6R1zMnYz@@m0CAv2K>xl{ zjX%+hyai{3+q6wjTGJq6rL+qB4oZoU+2gvlPOLQMz2ie6$3$7gVo>Bf^l4IF>) zq~Z^}p!%<~#7AdV{{kDl5;i`=;&!>LRYgvJrN^s>ZyuZU(wydg)7i98_=jUw#6g+U z_dHvSDVt5Z`uV0{>tFOq5UV9}?z3BAiUI#$)xatlh++ zM_iGjpzqd4K_P>Bf)Ai|P8UNw06%{^3yVR9Uuc1yJ-qCn{LH(O|KvykrD%2dY_}gl zt*e0A!=yjLy@75fM95~~>H6F!PyX*E)?B}T>Lh*cT{OmOTROIF~+Tty3%$kqpIz8{Exa^4*|sPhj+j=R`N#?CR8^JEen^ZRdE ze#(@O2X}wXmUY|n46|wuA`=C8(UC`7vymYt0e|00!!Q)a?*-qXs4(-K7X%u(X-;+Zc2$Ap|=1&&MZIBtMp)f3SUDMgR0)~09yQeY@Rfp!+t zh~giw1EcJp4XrY8s@!cWKhrMmkS#?g_U?_%dt+VKQ9Wv7`1}+<&Tj77QNvs}yApu1 zL<%Mha95h_>*MY7{neiY530=u3vS)aFH(DvgS^~kR`H?;ihP~m-=ZhB19VuBfse$x z0rtwn=<0etMOjSfSxDoM#B(xcrzeb%r{?X0{w88qP`d>G5@Q-t8WK7u=PbTpqakq* z$lBb8vj`;A1qoBSc6{jq007jJaWRp%SKmlNrk1IL?3LujoAQqEkD-aua(UC`70RRAF0ssIJ000000000000000 c0ELqbEIt7klS?c;0rZoJEG7n6DF6Tf08pq|0ssI2 delta 1826 zcmV+-2i^F)S+!ZP?FN6kBy`B+0ssKe1^@sL0001ZY%h0ja%*C5Z)+}iZEU1fU2obj z6n&qx{}A~-%?E+D5uqwDG^A~+)~$Vsgp6Z|g=1&715{Q2`>q2CQ1;NZ5%?qb>iFF2 zb8q@L+k!i5sx*@#LBWNO94d&+m{=z0_pgb2g&b|L$S{|JCg^{OYIHOB{Hec@YBiT~ z)^8dfeU+69620o^Ce@3W(m54 zt=!O)7pf|U72{wHqp0H}Z_vv5PB}W4o2gjc3L#A`tOS46E})28Zm1I2(2*1d1h^0A zqhcHM0eh57khb%a{;8OvP*ET(2ogq2Vm#M(*yK*7c!I`pYO7C|n9!7RCRXmzzAUJ5 z371voW^_GcWL83b*g{O{!M0x)GOIXEmvZewi8iyVse+!6YDH38qABo^l_FH9bW12t zkF<}^3+;bD)Q^cxzSoAoTfa^-WI@G^!tac7U_BjwgIm7GYq)bzR<>^mQ@GTiGZRF` z!R&c_edYJUaO6glap*?F;iY>!8C|*K%dq2rxr~OPKY4**R4*nHS0>-f$wDV60_~ic zzT<6U3H-QX*@4EhzkggizZx3biw)Q|&Id*}`XGNiyLGmYOk{FXNA%RJBWRV#+0>Rt zmYE!6+x4%z&AYFZEpwn71d(-w>aw&FbV6smqcefWwZjP=?}$&`pMh6BJEE?sd)u=E z_z>8+&MZY7$Y@4ZF2R z^DzS&`~{OS3>32i3PJ)2+x!VBoCE*>kdsafBY)E{5QguOcn8b(jpLr!Mom|URbi#Q zK$OF^>r5J}b{uS{2N3VhI6W<@5M`^>aqRK;|1+6P?{`L%4LGlCol~Bqlt3+Qq3Tsm zzkHte?kMp=)P>NthMexf)BD-$SJSO^YhM8bf`r=Vvf?WKlIhm3l#G(jdRvAB$?V|yI{gWo zFd@&R>-=xR@F8=sQSk*{Q2m!#;-fRGe}91uUI-hXVX<5;YgLicpXu?}!#j^ddKpf8 zzvygQD15^)E8?Kc>06#XjVYT=yZ-sAVC$dFNf65gXpjL=gH!UuTCn5bQZQkG`_g7#A8()Uui>QlsM>6>;Lgv(Q?eHdsC9~e zi-FhBUnTnF@RK?!EgakY2`QWe0058* z000;O000000000000000G7OUsD;1NNDlY;A5t9!q6_eg7F9EQV4l6|hT^5so78R3f zD=Gn5la(tv0RxlJD<>QHHZ=2H0RRAF0ssIJ0000000000000000DhAaEIt7elTj=^ Q0q&EJEG7n0DF6Tf09}e=^Z)<= diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index 1226c7ec74..bd82c907ec 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -33,7 +33,7 @@ a.TOTAL_FLOOR_NUM as totalFloorNum, a.TOTAL_UNIT_NUM as totalUnitNum, a.BUILDING_NAME as buildingType, - b.NEIGHBOR_HOOD_NAME as neighbourHoodName + b.NEIGHBOR_HOOD_NAME as neighborHoodName from ic_building a LEFT JOIN ic_neighbor_hood b on a.NEIGHBOR_HOOD_ID = b.ID @@ -50,12 +50,12 @@ select a.HOUSE_NAME as houseName, - c.NEIGHBOR_HOOD_NAME as neighbourHoodName, + c.NEIGHBOR_HOOD_NAME as neighborHoodName, b.BUILDING_NAME as buildingName, d.UNIT_NUM as unitNum, a.DOOR_NAME as doorName, - a.HOUSE_TYPE as houseType, + if(a.RENT_FLAG=1,'是','否') as rentFlag, a.OWNER_NAME as ownerName, - a.RENT_FLAG as rentFlag, - a.PURPOSE as purpose, + /*a.RENT_FLAG as rentFlag, + a.PURPOSE as purpose,*/ a.OWNER_PHONE as ownerPhone, a.OWNER_ID_CARD as ownerIdCard, @@ -122,7 +122,8 @@ b.ID as buildingId, a.BUILDING_UNIT_ID as unitNumKey, a.HOUSE_TYPE as houseTypeKey, - a.PURPOSE as purposeKey + a.PURPOSE as purposeKey, + a.RENT_FLAG as rentFlagKey from ic_house a LEFT JOIN ic_building b on a.BUILDING_ID = b.ID and b.DEL_FLAG = '0' LEFT JOIN ic_neighbor_hood c on a.NEIGHBOR_HOOD_ID = c.ID and c.DEL_FLAG = '0' @@ -155,7 +156,7 @@ a.OWNER_PHONE as ownerPhone, a.OWNER_ID_CARD as ownerIdCard, b.BUILDING_NAME as buildingName, - c.NEIGHBOR_HOOD_NAME as neighbourHoodName, + c.NEIGHBOR_HOOD_NAME as neighborHoodName, d.UNIT_NUM as unitName from ic_house a INNER JOIN ic_building b on a.BUILDING_ID = b.ID and b.DEL_FLAG = '0' @@ -188,7 +189,7 @@ a.OWNER_PHONE as ownerPhone, a.OWNER_ID_CARD as ownerIdCard, b.BUILDING_NAME as buildingName, - c.NEIGHBOR_HOOD_NAME as neighbourHoodName, + c.NEIGHBOR_HOOD_NAME as neighborHoodName, d.UNIT_NUM as unitName from ic_house a INNER JOIN ic_building b on a.BUILDING_ID = b.ID