From cc1098fc00a50cb1591d182f04bc37066ff0a9e2 Mon Sep 17 00:00:00 2001 From: 罗元桥 <2376770955@qq.com> Date: 星期四, 05 八月 2021 15:12:39 +0800 Subject: [PATCH] Merge branch 'test' into 'master' --- springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/HouseApi.java | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/HouseApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/HouseApi.java index 9f1bbd5..4076b80 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/HouseApi.java +++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/HouseApi.java @@ -3,8 +3,13 @@ import com.panzhihua.common.model.dtos.community.ComOpsHouseDTO; import com.panzhihua.common.model.dtos.community.PageComOpsHouseDTO; import com.panzhihua.common.model.vos.R; +import com.panzhihua.common.model.vos.community.ComActVO; +import com.panzhihua.common.model.vos.community.ComMngStructAreaVO; import com.panzhihua.common.model.vos.community.ComOpsHouseUndercarriageVO; import com.panzhihua.common.model.vos.community.ComOpsHouseVO; +import com.panzhihua.service_community.model.dos.ComMngStructAreaDO; +import com.panzhihua.service_community.service.ComActService; +import com.panzhihua.service_community.service.ComMngStructAreaService; import com.panzhihua.service_community.service.ComOpsHouseService; import lombok.extern.slf4j.Slf4j; import org.springframework.transaction.annotation.Transactional; @@ -24,6 +29,8 @@ public class HouseApi { @Resource private ComOpsHouseService comOpsHouseService; + @Resource + private ComMngStructAreaService comMngStructAreaService; /** @@ -43,6 +50,15 @@ */ @PostMapping("addOpsHouse") public R addOpsHouse(@RequestBody ComOpsHouseDTO comOpsHouseDTO){ + Long houseCommunityId = comOpsHouseDTO.getHouseCommunityId(); + if(houseCommunityId!=null) { + R<ComMngStructAreaVO> r = comMngStructAreaService.detailArea(houseCommunityId); + if(R.isOk(r)&&r.getData()!=null) { + ComMngStructAreaVO comMngStructAreaVO = r.getData(); + comOpsHouseDTO.setHouseCommunityName(comMngStructAreaVO.getAreaName()); + } + + } return comOpsHouseService.addHouse(comOpsHouseDTO); } -- Gitblit v1.7.1