From cf7052bd8f8516516d6f424b4df35c6329ee1d16 Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期五, 05 九月 2025 09:22:55 +0800
Subject: [PATCH] 报表完善0905
---
service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportResourceStoreSMOImpl.java | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportResourceStoreSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportResourceStoreSMOImpl.java
index 2ed1f16..6c1b230 100644
--- a/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportResourceStoreSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportResourceStoreSMOImpl.java
@@ -6,9 +6,9 @@
import com.java110.api.smo.assetImport.IImportResourceStoreSMO;
import com.java110.core.context.IPageData;
import com.java110.core.log.LoggerFactory;
-import com.java110.entity.assetImport.ImportOwnerRoomDto;
-import com.java110.entity.assetImport.ImportResourceStoreDto;
-import com.java110.entity.component.ComponentValidateResult;
+import com.java110.dto.importData.ImportOwnerRoomDto;
+import com.java110.dto.importData.ImportResourceStoreDto;
+import com.java110.dto.system.ComponentValidateResult;
import com.java110.intf.community.IImportOwnerRoomInnerServiceSMO;
import com.java110.utils.util.Assert;
import com.java110.utils.util.ImportExcelUtils;
@@ -100,15 +100,24 @@
continue;
}
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[8], (osIndex + 1) + "琛岀墿鍝佸憡璀﹀簱瀛樹笉鑳戒负绌�");
- Assert.hasValue(os[9], (osIndex + 1) + "琛岀墿鍝佺被鍨嬩笉鑳戒负绌�");
- Assert.hasValue(os[10], (osIndex + 1) + "琛屾槸鍚﹀浐瀹氱墿鍝佷笉鑳戒负绌�");
+// Assert.hasValue(os[2], (osIndex + 1) + "琛岀墿鍝佺紪鍙蜂笉鑳戒负绌�");
+ os[2] = os[2] == null ? "" : os[2];
+ os[3] = os[3] == null ? "0" : os[3];
+ os[4] = os[4] == null ? "0" : os[4];
+ os[6] = os[6] == null ? "0" : os[6];
+ os[7] = os[7] == null ? "0" : os[7];
+ os[8] = os[8] == null ? "0" : os[8];
+ os[9] = os[9] == null ? "" : os[9];
+ os[10] = os[10] == null ? "Y" : os[10];
+ os[5] = os[5] == null ? "0" : os[5];
+// 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[8], (osIndex + 1) + "琛岀墿鍝佸憡璀﹀簱瀛樹笉鑳戒负绌�");
+// Assert.hasValue(os[9], (osIndex + 1) + "琛岀墿鍝佺被鍨嬩笉鑳戒负绌�");
+// Assert.hasValue(os[10], (osIndex + 1) + "琛屾槸鍚﹀浐瀹氱墿鍝佷笉鑳戒负绌�");
resourceStoreDto = new ImportResourceStoreDto();
resourceStoreDto.setCommunityId(result.getCommunityId());
resourceStoreDto.setResName(os[1].toString());
@@ -119,10 +128,10 @@
resourceStoreDto.setOutLowPrice(os[6].toString());
resourceStoreDto.setOutHighPrice(os[7].toString());
resourceStoreDto.setWarningStock(os[8].toString());
- resourceStoreDto.setRstName(os[9].toString());
+ resourceStoreDto.setRstName(os[9] == "" ? "鏈垎绫�" : os[9].toString());
resourceStoreDto.setIsFixed(os[10].toString());
- if (os.length > 11) {
+ if (os.length > 11 && !StringUtil.isNullOrNone(os[11])) {
resourceStoreDto.setRemark(os[11].toString());
}
resourceStoreDtos.add(resourceStoreDto);
--
Gitblit v1.8.0