From ab6a423cf604b83f06b5768dbc162ece744a32d9 Mon Sep 17 00:00:00 2001
From: shane <88386378@qq.com>
Date: 星期五, 20 八月 2021 00:34:11 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportRoomFeeSMOImpl.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportRoomFeeSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportRoomFeeSMOImpl.java
old mode 100644
new mode 100755
index 286e9de..a801bbc
--- a/service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportRoomFeeSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/assetImport/impl/ImportRoomFeeSMOImpl.java
@@ -11,6 +11,7 @@
import com.java110.core.context.IPageData;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.RoomDto;
+import com.java110.dto.fee.FeeDetailDto;
import com.java110.dto.fee.FeeDto;
import com.java110.entity.assetImport.ImportRoomFee;
import com.java110.entity.component.ComponentValidateResult;
@@ -39,6 +40,7 @@
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.multipart.MultipartFile;
+import org.thymeleaf.util.StringUtils;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -136,6 +138,10 @@
JSONObject paramIn = JSONObject.parseObject(pd.getReqData());
ImportRoomFee importRoomFee = BeanConvertUtil.covertBean(paramIn,ImportRoomFee.class);
importRoomFee.setRoomId(paramIn.getString("objId"));
+ if(paramIn.containsKey("objType") && FeeDto.PAYER_OBJ_TYPE_CONTRACT.equals(paramIn.getString("objType"))){
+ importRoomFee.setContractId(paramIn.getString("objId"));
+ importRoomFee.setRoomId("");
+ }
List<ImportRoomFee> rooms = new ArrayList<ImportRoomFee>();
rooms.add(importRoomFee);
return dealExcelData(pd, rooms, result);
@@ -258,6 +264,10 @@
String apiUrl = ServiceConstant.SERVICE_API_URL + "/api/feeApi/importRoomFees";
+ if(!StringUtils.isEmpty(tmpImportRoomFee.get(0).getContractId())){
+ apiUrl = ServiceConstant.SERVICE_API_URL + "/api/feeApi/importContractFees";
+ }
+
ResponseEntity<String> responseEntity = this.callCenterService(restTemplate, pd, data.toJSONString(), apiUrl, HttpMethod.POST);
if (HttpStatus.OK != responseEntity.getStatusCode()) {
--
Gitblit v1.8.0