From 7f3372fe96d927debd388a0cb285a45e6b952296 Mon Sep 17 00:00:00 2001
From: chengf <2156125618@qq.com>
Date: 星期四, 17 七月 2025 18:23:54 +0800
Subject: [PATCH] 房产新增字段、采购去除必输项2025/07/17
---
service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java | 126 ++++++++++++++++++++++++++++-------------
1 files changed, 86 insertions(+), 40 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java
index 105fed7..bf7ef93 100644
--- a/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportOwnerRoomSMOImpl.java
@@ -4,13 +4,12 @@
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.room.RoomDto;
import com.java110.dto.owner.OwnerDto;
-import com.java110.entity.assetImport.ImportOwnerRoomDto;
-import com.java110.entity.component.ComponentValidateResult;
+import com.java110.dto.importData.ImportOwnerRoomDto;
+import com.java110.dto.system.ComponentValidateResult;
import com.java110.intf.community.IImportOwnerRoomInnerServiceSMO;
import com.java110.utils.util.Assert;
-import com.java110.utils.util.CommonUtil;
import com.java110.utils.util.ImportExcelUtils;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
@@ -100,7 +99,7 @@
throw new IllegalArgumentException((roomIndex + 1) + "琛屽崟鍏冧腑鍖呭惈鐗规畩绗﹀彿 - # 锛� & 璇峰垹闄わ紒");
}
if (hasRoomSpecialCharacters(importOwnerRoomDto.getRoomNum())) {
- throw new IllegalArgumentException((roomIndex + 1) + "琛屾埧灞嬩腑鍖呭惈鐗规畩绗﹀彿 # 锛� & 璇峰垹闄わ紒");
+ throw new IllegalArgumentException((roomIndex + 1) + "琛屽崟鍏冧腑鍖呭惈鐗规畩绗﹀彿 - # 锛� & 璇峰垹闄わ紒");
}
// if (!StringUtil.isNumber(importOwnerRoomDto.getLayer())) {
@@ -134,27 +133,28 @@
}
if (StringUtil.isEmpty(importOwnerRoomDto.getSex())) {
- throw new IllegalArgumentException((roomIndex + 1) + "琛屾�у埆涓嶈兘涓虹┖");
+ importOwnerRoomDto.setSex("");
+// throw new IllegalArgumentException((roomIndex + 1) + "琛屾�у埆涓嶈兘涓虹┖");
}
- if (StringUtil.isEmpty(importOwnerRoomDto.getAge())) {
- throw new IllegalArgumentException((roomIndex + 1) + "琛屽勾榫勪笉鑳戒负绌�");
- }
+// if (StringUtil.isEmpty(importOwnerRoomDto.getAge())) {
+// throw new IllegalArgumentException((roomIndex + 1) + "琛屽勾榫勪笉鑳戒负绌�");
+// }
//绯荤粺鐩墠 鍦ㄩ娓彴婀� 浠ュ強鏂板姞鍧＄瓑鍦伴兘鏈夊晢鐢� 鎵�浠� 骞朵笉鏄腑鍥藉ぇ闄嗘墜鏈哄彿瑙勫垯 鎵�浠ヤ笉鍋氫弗鏍兼牎楠�
//鐑﹁涓撲笟娴嬭瘯鍥㈤槦鍕垮柗
- if (StringUtil.isEmpty(importOwnerRoomDto.getTel())) {
- throw new IllegalArgumentException((roomIndex + 1) + "琛屾墜鏈哄彿涓嶈兘涓虹┖");
- }
+// if (StringUtil.isEmpty(importOwnerRoomDto.getTel())) {
+// throw new IllegalArgumentException((roomIndex + 1) + "琛屾墜鏈哄彿涓嶈兘涓虹┖");
+// }
if (importOwnerRoomDto.getTel().length() > 11) {
throw new IllegalArgumentException((roomIndex + 1) + "琛屾墜鏈哄彿瓒呰繃11浣�,璇锋牳瀹�");
}
- if (StringUtil.isEmpty(importOwnerRoomDto.getIdCard())) {
- throw new IllegalArgumentException((roomIndex + 1) + "琛岃韩浠借瘉鍙蜂笉鑳戒负绌�");
- }
+// if (StringUtil.isEmpty(importOwnerRoomDto.getIdCard())) {
+// throw new IllegalArgumentException((roomIndex + 1) + "琛岃韩浠借瘉鍙蜂笉鑳戒负绌�");
+// }
- if (importOwnerRoomDto.getIdCard().length() > 18) {
+ if (!StringUtil.isEmpty(importOwnerRoomDto.getIdCard()) && importOwnerRoomDto.getIdCard().length() > 18) {
throw new IllegalArgumentException((roomIndex + 1) + " 鐨勮韩浠借瘉瓒呰繃18浣�,璇锋牳瀹�");
}
if (!StringUtil.isNumber(importOwnerRoomDto.getOwnerTypeCd())) {
@@ -176,13 +176,14 @@
// 鏍￠獙鎴愬憳涔嬪墠鏄惁瀛樺湪 涓氫富瑙掕壊
hasOwnerType = false;
for (int preRoomIndex = 0; preRoomIndex < roomIndex; preRoomIndex++) {
- tmpImportOwnerRoomDto = ownerRooms.get(roomIndex);
+ tmpImportOwnerRoomDto = ownerRooms.get(preRoomIndex);
if (tmpImportOwnerRoomDto.getFloorNum().equals(importOwnerRoomDto.getFloorNum())
&& tmpImportOwnerRoomDto.getUnitNum().equals(importOwnerRoomDto.getUnitNum())
&& tmpImportOwnerRoomDto.getRoomNum().equals(importOwnerRoomDto.getRoomNum())
- && OwnerDto.OWNER_TYPE_CD_OWNER.equals(importOwnerRoomDto.getOwnerTypeCd())) {
+ && OwnerDto.OWNER_TYPE_CD_OWNER.equals(tmpImportOwnerRoomDto.getOwnerTypeCd())) {
hasOwnerType = true;
+ break;
}
}
@@ -227,11 +228,41 @@
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) + "琛屼笟涓荤被鍨嬩笉鑳戒负绌�");
+// Assert.hasValue(os[13], (osIndex + 1) + "琛屾�у埆涓嶈兘涓虹┖");
+ // Assert.hasValue(os[14], (osIndex + 1) + "琛屽勾榫勪笉鑳戒负绌�");
+// Assert.hasValue(os[14], (osIndex + 1) + "琛屾墜鏈哄彿涓嶈兘涓虹┖");
+ //Assert.hasValue(os[15], (osIndex + 1) + "琛岃韩浠借瘉涓嶈兘涓虹┖");
+ Assert.hasValue(os[16], (osIndex + 1) + "琛屼笟涓荤被鍨嬩笉鑳戒负绌�");
+ }
+
+ Assert.hasValue(os[0], (osIndex + 1) + "琛屾ゼ鍙蜂笉鑳戒负绌�");
+ Assert.hasValue(os[1], (osIndex + 1) + "琛屽崟鍏冧笉鑳戒负绌�");
+ Assert.hasValue(os[2], (osIndex + 1) + "琛屾埧灞嬩笉鑳戒负绌�");
+
+ Assert.hasValue(os[3], (osIndex + 1) + "闂ㄥ鍙蜂笉鑳戒负绌�");
+
+ Assert.hasValue(os[4], (osIndex + 1) + "琛屾ゼ灞備笉鑳戒负绌�");
+ Assert.hasValue(os[5], (osIndex + 1) + "琛屾�绘ゼ灞備笉鑳戒负绌�");
+
+ Assert.hasValue(os[6], (osIndex + 1) + "鐗╀笟绫诲瀷涓嶈兘涓虹┖");
+ Assert.hasValue(os[7], (osIndex + 1) + "浜ц瘉鍦板潃涓嶈兘涓虹┖");
+
+ Assert.hasValue(os[9], (osIndex + 1) + "琛屾槸鍚︽湁鐢垫涓嶈兘涓虹┖");
+ Assert.hasValue(os[10], (osIndex + 1) + "琛屾埧灞嬬被鍨嬩笉鑳戒负绌�");
+ 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) + "琛屾埧灞嬬姸鎬佷笉鑳戒负绌�");
+ if (os.length > 16 && !StringUtil.isNullOrNone(os[16])) {
+ Assert.hasValue(os[16], (osIndex + 1) + "琛屼笟涓诲悕绉颁笉鑳戒负绌�");
+ // Assert.hasValue(os[14], (osIndex + 1) + "琛屽勾榫勪笉鑳戒负绌�");
+// Assert.hasValue(os[18], (osIndex + 1) + "琛屾墜鏈哄彿涓嶈兘涓虹┖");
+ //Assert.hasValue(os[15], (osIndex + 1) + "琛岃韩浠借瘉涓嶈兘涓虹┖");
+ Assert.hasValue(os[20], (osIndex + 1) + "琛屼笟涓荤被鍨嬩笉鑳戒负绌�");
+ Assert.hasValue(os[21], (osIndex + 1) + "琛屼汉鍛樼被鍨嬩笉鑳戒负绌�");
+ Assert.hasValue(os[22], (osIndex + 1) + "琛屼汉鍛樿鑹蹭笉鑳戒负绌�");
+ Assert.hasValue(os[23], (osIndex + 1) + "琛岃仈绯讳汉涓嶈兘涓虹┖");
}
importOwnerRoomDto = new ImportOwnerRoomDto();
@@ -240,24 +271,39 @@
importOwnerRoomDto.setFloorNum(os[0].toString().trim());
importOwnerRoomDto.setUnitNum(os[1].toString().trim());
importOwnerRoomDto.setRoomNum(os[2].toString().trim());
- importOwnerRoomDto.setLayer(os[3].toString().trim());
- importOwnerRoomDto.setLayerCount(os[4].toString().trim());
+
+ importOwnerRoomDto.setDoorRoomNum(os[3].toString().trim());
+
+ importOwnerRoomDto.setLayer(os[4].toString().trim());
+ importOwnerRoomDto.setLayerCount(os[5].toString().trim());
+
+ importOwnerRoomDto.setPersonType(os[6].toString().trim());
+ importOwnerRoomDto.setPropertyAddress(os[7].toString().trim());
+ importOwnerRoomDto.setHouseCertificateNo(os[8] == null ? "" : os[8].toString().trim());
+
//importOwnerRoomDto.setLift(os[5].toString().trim());
- importOwnerRoomDto.setLift("鏈�".equals(os[5].toString().trim()) ? "1010" : "2020");
- importOwnerRoomDto.setRoomSubType(os[6].toString().trim());
- importOwnerRoomDto.setSection(os[7].toString().trim());
- importOwnerRoomDto.setBuiltUpArea(os[8].toString().trim());
- importOwnerRoomDto.setRoomArea(os[9].toString().trim());
- importOwnerRoomDto.setRoomRent(os[10].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[15].toString().trim());
- importOwnerRoomDto.setIdCard(os[16].toString().trim());
- importOwnerRoomDto.setOwnerTypeCd(os[17].toString().trim());
+ importOwnerRoomDto.setLift("鏈�".equals(os[9].toString().trim()) ? "1010" : "2020");
+ importOwnerRoomDto.setRoomSubType(os[10].toString().trim());
+ importOwnerRoomDto.setSection(os[11].toString().trim());
+ importOwnerRoomDto.setBuiltUpArea(os[12].toString().trim());
+ importOwnerRoomDto.setRoomArea(os[13].toString().trim());
+ importOwnerRoomDto.setRoomRent(os[14].toString().trim());
+ importOwnerRoomDto.setRoomState(os[15].toString().trim());
+ if (os.length > 16 && !StringUtil.isNullOrNone(os[16])) {
+ importOwnerRoomDto.setOwnerName(os[16].toString().trim());
+ importOwnerRoomDto.setSex(os[17] == null ? null : "鐢�".equals(os[17].toString().trim()) ? "0" : "1");
+ // String age = StringUtil.isNullOrNone(os[14]) ? CommonUtil.getAgeByCertId(os[16].toString().trim()) : os[14].toString().trim();
+ importOwnerRoomDto.setAge("1");
+ importOwnerRoomDto.setTel(os[18] == null ? "" :os[18].toString().trim());
+ String idCard = StringUtil.isNullOrNone(os[19]) ? "" : os[19].toString().trim();
+ importOwnerRoomDto.setIdCard(idCard);
+ importOwnerRoomDto.setOwnerTypeCd(os[20].toString().trim());
+ importOwnerRoomDto.setPersonType(os[21].toString().trim());
+ importOwnerRoomDto.setPersonRole(os[22].toString().trim());
+ importOwnerRoomDto.setConcactPerson(os[23].toString().trim());
+ }
+ if (os.length > 24 && !StringUtil.isNullOrNone(os[24])) {
+ importOwnerRoomDto.setConcactLink(os[24].toString().trim());
}
--
Gitblit v1.8.0