From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-community/src/main/java/com/java110/community/cmd/communityLocation/ListCommunityLocationCmd.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/communityLocation/ListCommunityLocationCmd.java b/service-community/src/main/java/com/java110/community/cmd/communityLocation/ListCommunityLocationCmd.java
index 0a313ca..2706679 100644
--- a/service-community/src/main/java/com/java110/community/cmd/communityLocation/ListCommunityLocationCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/communityLocation/ListCommunityLocationCmd.java
@@ -23,9 +23,7 @@
import com.java110.dto.FloorDto;
import com.java110.dto.UnitDto;
import com.java110.dto.community.CommunityLocationDto;
-import com.java110.intf.community.ICommunityLocationInnerServiceSMO;
-import com.java110.intf.community.IFloorInnerServiceSMO;
-import com.java110.intf.community.IUnitInnerServiceSMO;
+import com.java110.intf.community.*;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -90,12 +88,20 @@
List<UnitDto> unitDtos = unitInnerServiceSMOImpl.queryUnits(unitDto);
Assert.listOnlyOne(unitDtos, "鏌ヨ鍗曞厓閿欒");
communityLocation.setFloorId(unitDtos.get(0).getFloorId());
- communityLocation.setUnitNum(unitDtos.get(0).getUnitNum());
+ communityLocation.setUnitId(unitDtos.get(0).getUnitId());
FloorDto floorDto = new FloorDto();
floorDto.setFloorId(unitDtos.get(0).getFloorId());
List<FloorDto> floorDtos = floorInnerServiceSMOImpl.queryFloors(floorDto);
Assert.listOnlyOne(floorDtos, "鏌ヨ妤兼爧閿欒");
- communityLocation.setFloorNum(floorDtos.get(0).getFloorNum());
+ } else if (!StringUtil.isEmpty(communityLocation.getLocationType()) && communityLocation.getLocationType().equals("6000")
+ && !StringUtil.isEmpty(communityLocation.getLocationObjId()) && !communityLocation.getLocationObjId().equals("-1")) { //妤兼爧
+ communityLocation.setFloorId(communityLocation.getLocationObjId());
+ } else if (!StringUtil.isEmpty(communityLocation.getLocationType()) && communityLocation.getLocationType().equals("7000")
+ && !StringUtil.isEmpty(communityLocation.getLocationObjId()) && !communityLocation.getLocationObjId().equals("-1")) { //鍋滆溅鍦�
+ communityLocation.setPaId(communityLocation.getLocationObjId());
+ } else if (!StringUtil.isEmpty(communityLocation.getLocationType()) && communityLocation.getLocationType().equals("4000")
+ && !StringUtil.isEmpty(communityLocation.getLocationObjId()) && !communityLocation.getLocationObjId().equals("-1")) { //宀椾涵
+ communityLocation.setBoxId(communityLocation.getLocationObjId());
}
communityLocationDtos.add(communityLocation);
}
--
Gitblit v1.8.0