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/AssetImportSMOImpl.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 022640d..a7d4b32 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 importData.IImportDataCleaningAdapt;
import org.apache.poi.ss.usermodel.Workbook;
import org.slf4j.Logger;
import com.java110.core.log.LoggerFactory;
@@ -26,9 +26,8 @@
import org.springframework.web.client.RestTemplate;
import org.springframework.web.multipart.MultipartFile;
-import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Date;
+import java.util.Calendar;
import java.util.List;
/**
@@ -72,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";
@@ -82,6 +82,7 @@
}
try {
ComponentValidateResult result = this.validateStoreStaffCommunityRelationship(pd, restTemplate);
+ paramIn.put("storeId", result.getStoreId());
Workbook workbook = null; //宸ヤ綔绨�
//宸ヤ綔琛�
@@ -109,8 +110,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");
@@ -126,7 +127,9 @@
List<AssetImportLogDetailPo> assetImportLogDetailPos = new ArrayList<>();
AssetImportLogDetailPo assetImportLogDetailPo = null;
int flag = 0;
+ Calendar createTimeCal = Calendar.getInstance();
for (Object data : datas) {
+ createTimeCal.add(Calendar.SECOND,1);
assetImportLogDetailPo = new AssetImportLogDetailPo();
assetImportLogDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId("11"));
assetImportLogDetailPo.setLogId(logId);
@@ -134,6 +137,7 @@
assetImportLogDetailPo.setMessage("寰呭鍏�");
assetImportLogDetailPo.setCommunityId(result.getCommunityId());
assetImportLogDetailPo.setContent(JSONObject.toJSONString(data));
+ assetImportLogDetailPo.setCreateTime(DateUtil.getFormatTimeStringA(createTimeCal.getTime()));
assetImportLogDetailPos.add(assetImportLogDetailPo);
if (assetImportLogDetailPos.size() > DEFAULT_ROWS) {
flag = assetImportLogDetailInnerServiceSMOImpl.saveAssetImportLogDetails(assetImportLogDetailPos);
@@ -158,7 +162,6 @@
}
return ResultVo.error("瀵煎叆澶辫触");
}
-
}
--
Gitblit v1.8.0