From 9d9eb15c9cd57a76aa21a002f455da8674e70807 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 02 七月 2023 10:52:08 +0800
Subject: [PATCH] 解决
---
service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java
index ea0d86d..fe473fd 100644
--- a/service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java
@@ -8,7 +8,7 @@
import com.java110.core.context.IPageData;
import com.java110.core.log.LoggerFactory;
import com.java110.dto.fee.FeeConfigDto;
-import com.java110.entity.component.ComponentValidateResult;
+import com.java110.dto.system.ComponentValidateResult;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
@@ -17,7 +17,6 @@
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
@@ -33,6 +32,7 @@
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
/**
* @ClassName AssetImportSmoImpl
@@ -87,6 +87,18 @@
public ResponseEntity<Object> exportExcelData(IPageData pd) throws Exception {
ComponentValidateResult result = this.validateStoreStaffCommunityRelationship(pd, restTemplate);
+ Map pdHeaders = pd.getHeaders();
+ if (!StringUtil.isEmpty(result.getStoreId())) {
+ pdHeaders.remove("store-id");
+ pdHeaders.put("store-id", result.getStoreId());
+ }
+ if (!StringUtil.isEmpty(result.getLoginUserId())) {
+ pdHeaders.remove("user-id");
+ pdHeaders.remove("user_id");
+ pdHeaders.put("user-id", result.getUserId());
+ pdHeaders.put("user_id", result.getUserId());
+ pdHeaders.put("login-user-id",result.getLoginUserId());
+ }
Assert.hasKeyAndValue(JSONObject.parseObject(pd.getReqData()), "communityId", "璇锋眰涓湭鍖呭惈灏忓尯");
Assert.hasKeyAndValue(JSONObject.parseObject(pd.getReqData()), "pagePath", "璇锋眰涓湭鍖呭惈椤甸潰");
@@ -1243,7 +1255,7 @@
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("page", 1);
reqJson.put("row", 10000);
- apiUrl = "/reportFeeMonthStatistics/queryPrePayment" + mapToUrlParam(reqJson);
+ apiUrl = "/reportFeeMonthStatistics.queryPrePayment" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
@@ -1266,7 +1278,7 @@
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("page", 1);
reqJson.put("row", 10000);
- apiUrl = "/reportFeeMonthStatistics/queryDeadlineFee" + mapToUrlParam(reqJson);
+ apiUrl = "/reportFeeMonthStatistics.queryDeadlineFee" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
@@ -1989,7 +2001,7 @@
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("page", 1);
reqJson.put("row", 10000);
- apiUrl = "/reportFeeMonthStatistics/queryReportFeeSummary" + mapToUrlParam(reqJson);
+ apiUrl = "/reportFeeMonthStatistics.queryReportFeeSummary" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
--
Gitblit v1.8.0