diff --git a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.14__up_del_sys_dict_data.sql b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.14__up_del_sys_dict_data.sql new file mode 100644 index 0000000000..4e9f45a64f --- /dev/null +++ b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.14__up_del_sys_dict_data.sql @@ -0,0 +1,10 @@ +UPDATE `epmet_admin`.`sys_dict_data` SET `dict_label`='楼宇党建' WHERE (`id`='1000000000000000220'); +UPDATE `epmet_admin`.`sys_dict_data` SET `dict_label`='两新组织' WHERE (`id`='1000000000000000221'); +UPDATE `epmet_admin`.`sys_dict_data` SET `dict_label`='区域单位党建' WHERE (`id`='1000000000000000222'); +UPDATE `epmet_admin`.`sys_dict_data` SET `dict_label`='机关直属部门' WHERE (`id`='1000000000000000223'); +UPDATE `epmet_admin`.`sys_dict_data` SET `dict_label`='社会团体' WHERE (`id`='1000000000000000224'); +UPDATE `epmet_admin`.`sys_dict_data` SET `dict_label`='民办非企业单位' WHERE (`id`='1000000000000000225'); +UPDATE `epmet_admin`.`sys_dict_data` SET `dict_label`='基金会' WHERE (`id`='1000000000000000226'); +UPDATE `epmet_admin`.`sys_dict_data` SET `dict_label`='其他' WHERE (`id`='1000000000000000227'); + +DELETE FROM `epmet_admin`.`sys_dict_data` WHERE id = '1000000000000000228'; \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java index 2ee335dace..3d12115f05 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java @@ -1,13 +1,13 @@ package com.epmet.dto.result; -import cn.afterturn.easypoi.excel.annotation.Excel; import lombok.Data; import java.io.Serializable; /** * desc:房屋列表结果类 + * * @author liujianjun */ @Data @@ -20,7 +20,7 @@ public class IcHouseListResultDTO implements Serializable { private String doorName; - private String agencyId; + private String buildingId; private String houseName; @@ -30,30 +30,56 @@ public class IcHouseListResultDTO implements Serializable { private String purposeKey; private String unitNumKey; - @Excel(name = "所属组织") + /** + * 所属组织 + */ private String agencyName; - @Excel(name = "所属网格") + private String agencyId; + /** + * 所属网格 + */ private String gridName; - @Excel(name = "所属小区") + private String gridId; + /** + * 所属小区 + */ private String neighborHoodName; - @Excel(name = "所属楼栋") + /** + * 所属楼栋 + */ private String buildingName; - @Excel(name = "单元号") + /** + * 单元号 + */ private String unitNum; - @Excel(name = "房屋类型") + /** + * 房屋类型 + */ private String houseType; - @Excel(name = "房屋用途") + private String houseTypeKey; + /** + * 房屋用途 + */ private String purpose; - @Excel(name = "是否出租") + /** + * 是否出租 + */ private Integer rentFlagKey; - @Excel(name = "房主姓名") + + /** + * 房主姓名 + */ private String ownerName; - @Excel(name = "房主电话") + /** + * 房主电话 + */ private String ownerPhone; - @Excel(name = "房主身份证") + /** + * 房主身份证 + */ private String ownerIdCard; - private String gridId; - private String houseTypeKey; + + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java index 12a95e6cb0..5e9b870867 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java @@ -17,11 +17,9 @@ public interface ImportErrorMsgConstants { String HOUSE_TYPE_ERROR = "房屋类型的值未填写或者所填写信息在系统中未找到"; - String HOUSE_ERROR_NAME = "导入失败的列表-房屋"; - String BUILDING_ERROR_NAME = "导入失败的列表-楼栋"; - String NEIGHBORHOOD_ERROR_NAME = "导入失败的列表-小区"; String BUILDING_TYPE_ERROR = "楼栋类型的值未填写或者所填写信息在系统中未找到"; String NEIGHBORHOOD_TYPE_ERROR = "小区名称的值未填写或者所填写信息在系统中未找到"; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java index 0f32e356b7..edbdde8625 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java @@ -21,6 +21,7 @@ import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.IcHouseDTO; import com.epmet.dto.form.HouseFormDTO; import com.epmet.dto.result.HouseListResultDTO; import com.epmet.dto.result.HousesNameResultDTO; @@ -44,6 +45,12 @@ public class IcHouseController { @Autowired private IcHouseService icHouseService; + @GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + IcHouseDTO data = icHouseService.get(id); + return new Result().ok(data); + } + @PostMapping("houseoption") public Result> getHouseOption(@RequestBody HouseFormDTO formDTO){ return new Result>().ok(icHouseService.getHouseOption(formDTO)); 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 9a560cb8f9..f098674387 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 @@ -106,8 +106,6 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { } IcHouseDTO icHouseDTO= ConvertUtils.sourceToTarget(formDTO, IcHouseDTO.class); icHouseDTO.setCustomerId(customerId); -// icHouseDTO.setRentFlag(formDTO.getRentFlag()); - icHouseDTO.setHouseName(getHouseName(formDTO)); icHouseService.save(icHouseDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java index 94ed60ce9f..0cf1ee381b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java @@ -228,6 +228,9 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl