加入房屋状态

java110-bean/src/main/java/com/java110/entity/assetImport/ImportOwnerRoomDto.java

@@ -24,6 +24,7 @@ public class ImportOwnerRoomDto implements Serializable {
     private String ownerTypeCd;
     private String layer;
     private String userId;
+    private String roomState;
 
 
     public String getFloorNum() {
@@ -178,4 +179,12 @@ public class ImportOwnerRoomDto implements Serializable {
     public void setUserId(String userId) {
         this.userId = userId;
     }
+
+    public String getRoomState() {
+        return roomState;
+    }
+
+    public void setRoomState(String roomState) {
+        this.roomState = roomState;
+    }
 }

service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java

@@ -4,6 +4,7 @@ import com.java110.api.smo.DefaultAbstractComponentSMO;
 import com.java110.api.smo.assetImport.IImportOwnerRoomSMO;
 import com.java110.core.context.IPageData;
 import com.java110.core.log.LoggerFactory;
+import com.java110.dto.RoomDto;
 import com.java110.dto.owner.OwnerDto;
 import com.java110.entity.assetImport.ImportOwnerRoomDto;
 import com.java110.entity.component.ComponentValidateResult;
@@ -147,6 +148,15 @@ public class ImportOwnerRoomSMOImpl extends DefaultAbstractComponentSMO implemen
             if (!StringUtil.isNumber(importOwnerRoomDto.getOwnerTypeCd())) {
                 throw new IllegalArgumentException((roomIndex + 1) + "行业主类型不能为空");
             }
+
+            if(RoomDto.STATE_FREE.equals(importOwnerRoomDto.getRoomState()) && !StringUtil.isEmpty(importOwnerRoomDto.getOwnerName())){
+                throw new IllegalArgumentException((roomIndex + 1) + "行房屋状态为未销售状态，不能包含业主信息");
+            }
+
+            if(!RoomDto.STATE_FREE.equals(importOwnerRoomDto.getRoomState()) && StringUtil.isEmpty(importOwnerRoomDto.getOwnerName())){
+                throw new IllegalArgumentException((roomIndex + 1) + "行房屋状态不是未销售状态，必须包含业主信息");
+            }
+
             // 如果是业主 跳过
             if (OwnerDto.OWNER_TYPE_CD_OWNER.equals(importOwnerRoomDto.getOwnerTypeCd())) {
                 continue;
@@ -202,13 +212,14 @@ public class ImportOwnerRoomSMOImpl extends DefaultAbstractComponentSMO implemen
             Assert.hasValue(os[8], (osIndex + 1) + "行建筑面积不能为空");
             Assert.hasValue(os[9], (osIndex + 1) + "行室内面积不能为空");
             Assert.hasValue(os[10], (osIndex + 1) + "行租金不能为空");
-            if (os.length > 11 && !StringUtil.isNullOrNone(os[11])) {
-                Assert.hasValue(os[11], (osIndex + 1) + "行业主名称不能为空");
-                Assert.hasValue(os[12], (osIndex + 1) + "行性别不能为空");
-                Assert.hasValue(os[13], (osIndex + 1) + "行年龄不能为空");
-                Assert.hasValue(os[14], (osIndex + 1) + "行手机号不能为空");
-                Assert.hasValue(os[15], (osIndex + 1) + "行身份证不能为空");
-                Assert.hasValue(os[16], (osIndex + 1) + "行业主类型不能为空");
+            Assert.hasValue(os[11], (osIndex + 1) + "行房屋状态不能为空");
+            if (os.length > 12 && !StringUtil.isNullOrNone(os[12])) {
+                Assert.hasValue(os[12], (osIndex + 1) + "行业主名称不能为空");
+                Assert.hasValue(os[13], (osIndex + 1) + "行性别不能为空");
+                Assert.hasValue(os[14], (osIndex + 1) + "行年龄不能为空");
+                Assert.hasValue(os[15], (osIndex + 1) + "行手机号不能为空");
+                Assert.hasValue(os[16], (osIndex + 1) + "行身份证不能为空");
+                Assert.hasValue(os[17], (osIndex + 1) + "行业主类型不能为空");
             }
 
             importOwnerRoomDto = new ImportOwnerRoomDto();
@@ -226,16 +237,19 @@ public class ImportOwnerRoomSMOImpl extends DefaultAbstractComponentSMO implemen
             importOwnerRoomDto.setBuiltUpArea(os[8].toString().trim());
             importOwnerRoomDto.setRoomArea(os[9].toString().trim());
             importOwnerRoomDto.setRoomRent(os[10].toString().trim());
-            if (os.length > 11 && !StringUtil.isNullOrNone(os[11])) {
-                importOwnerRoomDto.setOwnerName(os[11].toString().trim());
-                importOwnerRoomDto.setSex("男".equals(os[12].toString().trim()) ? "0" : "1");
-                String age = StringUtil.isNullOrNone(os[13]) ? CommonUtil.getAgeByCertId(os[15].toString().trim()) : os[13].toString().trim();
+            importOwnerRoomDto.setRoomState(os[11].toString().trim());
+            if (os.length > 12 && !StringUtil.isNullOrNone(os[12])) {
+                importOwnerRoomDto.setOwnerName(os[12].toString().trim());
+                importOwnerRoomDto.setSex("男".equals(os[13].toString().trim()) ? "0" : "1");
+                String age = StringUtil.isNullOrNone(os[14]) ? CommonUtil.getAgeByCertId(os[16].toString().trim()) : os[14].toString().trim();
                 importOwnerRoomDto.setAge(age);
-                importOwnerRoomDto.setTel(os[14].toString().trim());
-                importOwnerRoomDto.setIdCard(os[15].toString().trim());
-                importOwnerRoomDto.setOwnerTypeCd(os[16].toString().trim());
+                importOwnerRoomDto.setTel(os[15].toString().trim());
+                importOwnerRoomDto.setIdCard(os[16].toString().trim());
+                importOwnerRoomDto.setOwnerTypeCd(os[17].toString().trim());
             }
 
+
+
             ownerRoomDtos.add(importOwnerRoomDto);
 
         }

service-community/src/main/java/com/java110/community/smo/impl/ImportOwnerRoomInnerServiceSMOImpl.java

@@ -273,7 +273,8 @@ public class ImportOwnerRoomInnerServiceSMOImpl extends BaseServiceSMO implement
         int flag = 0;
         if (roomDtos == null || roomDtos.size() < 1) {
             roomPo = new RoomPo();
-            roomPo.setState(StringUtil.isEmpty(importOwnerRoomDto.getOwnerName()) ? RoomDto.STATE_FREE : RoomDto.STATE_SELL);
+            //roomPo.setState(StringUtil.isEmpty(importOwnerRoomDto.getOwnerName()) ? RoomDto.STATE_FREE : RoomDto.STATE_SELL);
+            roomPo.setState(importOwnerRoomDto.getRoomState());
             roomPo.setRoomId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_roomId));
             roomPo.setApartment(importOwnerRoomDto.getSection());
             roomPo.setSection("1");