From b63f41b8a0cfce68770e5cb02c8dd3fd994f0c59 Mon Sep 17 00:00:00 2001
From: chengf <2156125618@qq.com>
Date: 星期二, 22 七月 2025 18:37:54 +0800
Subject: [PATCH] 修改费用导入模块2025/07/22
---
service-api/src/main/java/com/java110/api/smo/assetImport/impl/AssetImportSMOImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/assetImport/impl/AssetImportSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/assetImport/impl/AssetImportSMOImpl.java
index 7827aa5..844b643 100644
--- a/service-api/src/main/java/com/java110/api/smo/assetImport/impl/AssetImportSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/assetImport/impl/AssetImportSMOImpl.java
@@ -1,6 +1,7 @@
package com.java110.api.smo.assetImport.impl;
import com.alibaba.fastjson.JSONObject;
+import com.java110.api.importData.IImportDataCleaningAdapt;
import com.java110.api.smo.DefaultAbstractComponentSMO;
import com.java110.api.smo.assetImport.IAssetImportSMO;
import com.java110.core.context.IPageData;
@@ -15,7 +16,6 @@
import com.java110.utils.factory.ApplicationContextFactory;
import com.java110.utils.util.*;
import com.java110.vo.ResultVo;
-import com.java110.api.importData.IImportDataCleaningAdapt;
import org.apache.poi.ss.usermodel.Workbook;
import org.slf4j.Logger;
import com.java110.core.log.LoggerFactory;
@@ -71,6 +71,7 @@
@Override
public ResponseEntity<String> importExcelData(IPageData pd, MultipartFile uploadFile) throws Exception {
JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
+ paramIn.put("userId", pd.getUserId());
Assert.hasKeyAndValue(paramIn, "importAdapt", "鏈寘鍚ā鏉�");
String importAdapt = paramIn.getString("importAdapt") + "DataCleaning";
@@ -81,6 +82,7 @@
}
try {
ComponentValidateResult result = this.validateStoreStaffCommunityRelationship(pd, restTemplate);
+ paramIn.put("storeId", result.getStoreId());
Workbook workbook = null; //宸ヤ綔绨�
//宸ヤ綔琛�
@@ -89,6 +91,7 @@
// todo 閫傞厤鍣ㄥ皝瑁呮暟鎹�
List datas = importDataCleaningAdapt.analysisExcel(workbook, paramIn, result);
+
if (datas == null || datas.size() > MAX_LINE) {
throw new IllegalArgumentException("鏁版嵁涓虹┖锛屾垨鑰呮暟鎹鏁板ぇ浜�" + MAX_LINE);
@@ -108,8 +111,8 @@
* @param datas 鏁版嵁
*/
private ResponseEntity<String> saveLogAndImportData(IPageData pd,
- List datas,
- ComponentValidateResult result, String logType) {
+ List datas,
+ ComponentValidateResult result, String logType) {
ResponseEntity<String> responseEntity = null;
String logId = GenerateCodeFactory.getGeneratorId("10");
@@ -160,7 +163,6 @@
}
return ResultVo.error("瀵煎叆澶辫触");
}
-
}
--
Gitblit v1.8.0