From d36dc41c8ab71a6c723f26aa75b8bf486037bab3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 15 Apr 2022 14:33:03 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feign=E5=BC=95=E7=94=A8=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/IcHouseController.java | 7 +++++++ 1 file changed, 7 insertions(+) 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)); From b50690c8cde896018d3aea156ee5cacd86afa36e Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 15 Apr 2022 15:14:45 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=B3=A8=E8=A7=A3=E6=B2=A1=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/IcHouseListResultDTO.java | 56 ++++++++++++++----- .../epmet/service/impl/HouseServiceImpl.java | 2 - 2 files changed, 41 insertions(+), 17 deletions(-) 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/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index 7ad9c516b4..bac35ce64c 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 @@ -104,8 +104,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); } From 555bd39d1aaa70a46efe7d4878f84c507c8bf0d7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 15 Apr 2022 16:47:10 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=9C=89=E9=87=8D=E7=82=B9=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=E8=A1=8C=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcEpidemicSpecialAttentionServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) 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..285f8be11b 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 Date: Fri, 15 Apr 2022 16:57:19 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=9C=89=E9=87=8D=E7=82=B9=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=E8=A1=8C=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcEpidemicSpecialAttentionServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 285f8be11b..19148c1763 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,7 +228,7 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl Date: Fri, 15 Apr 2022 16:59:21 +0800 Subject: [PATCH 5/6] =?UTF-8?q?2=E8=A1=8C=E7=A8=8B=E4=B8=8A=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcEpidemicSpecialAttentionServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 19148c1763..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,7 +228,7 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl Date: Fri, 15 Apr 2022 17:01:12 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=94=B9=E6=9D=A5=E6=94=B9=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.14__up_del_sys_dict_data.sql | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.14__up_del_sys_dict_data.sql 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