From 4f9c122f237fbee16d5ef9c602b6db95d28ed7b0 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 10 二月 2020 14:35:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
WebService/src/main/java/com/java110/web/smo/assetImport/impl/AssetImportSMOImpl.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/smo/assetImport/impl/AssetImportSMOImpl.java b/WebService/src/main/java/com/java110/web/smo/assetImport/impl/AssetImportSMOImpl.java
index 8843080..8993c52 100644
--- a/WebService/src/main/java/com/java110/web/smo/assetImport/impl/AssetImportSMOImpl.java
+++ b/WebService/src/main/java/com/java110/web/smo/assetImport/impl/AssetImportSMOImpl.java
@@ -132,6 +132,7 @@
for (ImportParkingSpace parkingSpace : parkingSpaces) {
JSONObject savedParkingAreaInfo = getExistsParkingArea(pd, result, parkingSpace);
+ paramIn = new JSONObject();
// 濡傛灉涓嶅瓨鍦紝鎵嶆彃鍏�
if (savedParkingAreaInfo == null) {
apiUrl = ServiceConstant.SERVICE_API_URL + "/api/parkingArea.saveParkingArea";
@@ -149,8 +150,6 @@
if (savedParkingSpaceInfo != null) {
continue;
}
-
- paramIn = new JSONObject();
apiUrl = ServiceConstant.SERVICE_API_URL + "/api/parkingSpace.saveParkingSpace";
@@ -195,7 +194,7 @@
String feeTypeCd = "1001".equals(parkingSpace.getTypeCd())
? FeeTypeConstant.FEE_TYPE_SELL_UP_PARKING_SPACE : FeeTypeConstant.FEE_TYPE_SELL_DOWN_PARKING_SPACE;
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/feeConfig.listFeeConfigs?communityId=" + result.getCommunityId() + "&feeTypeCd=" + feeTypeCd+"&isDefault=T";
+ apiUrl = ServiceConstant.SERVICE_API_URL + "/api/feeConfig.listFeeConfigs?page=1&row=1&communityId=" + result.getCommunityId() + "&feeTypeCd=" + feeTypeCd+"&isDefault=T";
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
--
Gitblit v1.8.0