From 56931dc90c4e070d279a0cbf5822af010c481812 Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期三, 18 三月 2026 15:36:42 +0800
Subject: [PATCH] 导入测试
---
service-api/src/main/java/com/java110/api/importData/adapt/ImportPropertyWhiteListfFlowAdapt.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/importData/adapt/ImportPropertyWhiteListfFlowAdapt.java b/service-api/src/main/java/com/java110/api/importData/adapt/ImportPropertyWhiteListfFlowAdapt.java
index 7d31b27..bfe9004 100644
--- a/service-api/src/main/java/com/java110/api/importData/adapt/ImportPropertyWhiteListfFlowAdapt.java
+++ b/service-api/src/main/java/com/java110/api/importData/adapt/ImportPropertyWhiteListfFlowAdapt.java
@@ -1,7 +1,6 @@
package com.java110.api.importData.adapt;
import com.alibaba.fastjson.JSONObject;
-import com.java110.api.components.ValueUtil;
import com.java110.api.importData.DefaultImportDataAdapt;
import com.java110.api.importData.IImportDataCleaningAdapt;
import com.java110.dto.PropertyWhiteListFlowDto;
@@ -59,27 +58,27 @@
public void setCommunityId(PropertyWhiteListFlowDto po, Object[] os, List<Map<String, Object>> maps) {
for (Map<String, Object> map : maps) {
- if (ValueUtil.defaultValue(os[1]).isEmpty() && ValueUtil.defaultValue(os[2]).isEmpty()){
+ if (Vtil.defaultValue(os[1]) == null && Vtil.defaultValue(os[2]) == null){
throw new IllegalArgumentException("灏忓尯鍚嶇О鍜屽皬鍖虹紪鍙峰潎涓虹┖");
}
- if (ValueUtil.defaultValue(os[1]).isEmpty()) {
- if (Vtil.defaultValue(map.get("name")).contains(ValueUtil.defaultValue(os[2]))) {
+ if (Vtil.defaultValue(os[1]) == null) {
+ if (Vtil.defaultValue(map.get("name")).contains(Vtil.defaultValue(os[2]))) {
po.setCommunityId(map.get("communityId").toString());
return;
}
- } else if (ValueUtil.defaultValue(os[2]).isEmpty()){
- if (Vtil.defaultValue(map.get("communityCode")).equals(ValueUtil.defaultValue(os[1]))) {
+ } else if (Vtil.defaultValue(os[2]) == null){
+ if (Vtil.defaultValue(map.get("communityCode")).equals(Vtil.defaultValue(os[1]))) {
po.setCommunityId(map.get("communityId").toString());
return;
}
} else {
- if (Vtil.defaultValue(map.get("communityCode")).equals(ValueUtil.defaultValue(os[1])) && Vtil.defaultValue(map.get("name")).contains(ValueUtil.defaultValue(os[2]))) {
+ if (Vtil.defaultValue(map.get("communityCode")).equals(Vtil.defaultValue(os[1])) && Vtil.defaultValue(map.get("name")).contains(Vtil.defaultValue(os[2]))) {
po.setCommunityId(map.get("communityId").toString());
return;
}
}
}
- throw new IllegalArgumentException("鏈煡璇㈠埌灏忓尯锛�" + Vtil.appendHyphenToRight(ValueUtil.defaultValue(os[1])) + ValueUtil.defaultValue(os[2]));
+ throw new IllegalArgumentException("鏈煡璇㈠埌灏忓尯锛�" + Vtil.appendHyphenToRight(Vtil.defaultValue(os[1])) + Vtil.defaultValue(os[2]));
}
@@ -118,9 +117,6 @@
white.setRoomId(os[5] == null ? null : os[5].toString());//鎴垮彿
white.setPropertyAddress(os[5] == null ? null : os[5].toString());//涓氫富鍦板潃
white.setDoorRoomNum((os[6] == null ? "" : os[6].toString() + "-") + (os[7] == null ? "" : os[7].toString() + "-") + (os[8] == null ? "" : os[8].toString()) );//闂ㄥ競鍙�
- if (white.getDoorRoomNum().isEmpty()){
- white.setDoorRoomNum(null);
- }
setCommunityId(white, os, maps);
white.setSecondaryFeeTypeCd(os[13] == null ? null : os[13].toString());//鏀惰垂鍐呭
white.setChargeAmount(os[14] == null ? null : os[14].toString());//鏀惰垂閲戦
--
Gitblit v1.8.0