From ebf6117ccea680eae81a91f2fa355ce3a76eb621 Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期一, 15 九月 2025 18:00:37 +0800
Subject: [PATCH] 第二张报表导出0915
---
service-job/src/main/java/com/java110/job/importData/adapt/ImportRoomFeeQueueDataAdapt.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/importData/adapt/ImportRoomFeeQueueDataAdapt.java b/service-job/src/main/java/com/java110/job/importData/adapt/ImportRoomFeeQueueDataAdapt.java
index 86ff27f..9dbab29 100644
--- a/service-job/src/main/java/com/java110/job/importData/adapt/ImportRoomFeeQueueDataAdapt.java
+++ b/service-job/src/main/java/com/java110/job/importData/adapt/ImportRoomFeeQueueDataAdapt.java
@@ -314,7 +314,6 @@
FeeDto feeDto = new FeeDto();
feeDto.setFeeTypeCd(importRoomFee.getFeeTypeCd());
feeDto.setCommunityId(importRoomFee.getCommunityId());
- String dateStr = importRoomFee.getStartTime();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
try {
feeDto.setStartTime(sdf.parse(importRoomFee.getStartTime()));
@@ -325,6 +324,7 @@
feeDto.setPayerObjId(payFeePo.getPayerObjId());
if (payFeePo.getPayerObjType()!= null && payFeePo.getPayerObjType().equals(FeeDto.PAYER_OBJ_TYPE_CONTRACT)) {
feeDto.setIsContractFee("O");
+ feeDto.setContractFee(payFeePo.getContractFee());
}
int feeDtos = feeInnerServiceSMOImpl.getFeeInfoBus(feeDto);
if(feeDtos > 0){
@@ -337,7 +337,7 @@
payFeePo.setIncomeObjId(importRoomFee.getStoreId());
FeeConfigDto payFeePo1 = new FeeConfigDto();
payFeePo1.setFeeTypeCd(importRoomFee.getFeeTypeCd());
- List<FeeConfigDto> feeConfigDtos1 = payFeeConfigV1InnerServiceSMOImpl.queryPayFeeConfigs(payFeePo1);
+// List<FeeConfigDto> feeConfigDtos1 = payFeeConfigV1InnerServiceSMOImpl.queryPayFeeConfigs(payFeePo1);
payFeePo.setFeeTypeCd(importRoomFee.getFeeTypeCd());
payFeePo.setFeeFlag(feeConfigDtos.get(0).getFeeFlag());
payFeePo.setAmount(importRoomFee.getAmount());
--
Gitblit v1.8.0