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 | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 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 7b33351..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
@@ -119,6 +119,7 @@
String communityId = importRoomFee.getCommunityId();
String batchId = importRoomFee.getBatchId();
+
doImportRoomCreateFee(importRoomFee, batchId);
doImportCarCreateFee(importRoomFee, batchId);
doImportContractFee(importRoomFee, batchId);
@@ -227,6 +228,15 @@
throw new IllegalArgumentException(tmpImportRoomFee.getCarNum() + "涓嶅瓨鍦�");
}
}
+ try {
+ Integer.parseInt(importRoomFees.get(0).getFeeTypeCd());
+ }catch (Exception e){
+ DictDto dictDto = new DictDto();
+ dictDto.setTableName("pay_fee_config");
+ dictDto.setName(importRoomFees.get(0).getFeeTypeCd());
+ List<DictDto> dictDtos = iDictV1InnerServiceSMO.queryDicts(dictDto);
+ importRoomFees.get(0).setFeeTypeCd(dictDtos.get(0).getStatusCd());
+ }
doCreateFeeAndAttrs(importRoomFees.get(0), batchId);
}
@@ -262,6 +272,7 @@
payFeePo.setConfigId(feeConfigDtos.get(0).getConfigId());
if (FeeDto.PAYER_OBJ_TYPE_CONTRACT.equals(importRoomFee.getObjType())) {
ContractDto contractDto = new ContractDto();
+ contractDto.setCommunityId(importRoomFee.getCommunityId());
contractDto.setContractCode(importRoomFee.getContractId());
List<ContractDto> contractDtos = iContractInnerServiceSMO.queryContracts(contractDto);
if(contractDtos.size() == 0){
@@ -272,11 +283,12 @@
payFeePo.setContractFee(contractDtos.get(0).getContractId());
// payFeePo.setCreateTime(importFeeDetailPo.getC);
ContractPartyaDto contractPartyaDto = new ContractPartyaDto();
+ contractPartyaDto.setCommunityId(importRoomFee.getCommunityId());
if(importRoomFee.getPayerObjName() == null || Objects.equals(importRoomFee.getPayerObjName(), "")){//褰撴病鍐欏叆涓讳綋鏃�
contractPartyaDto.setPartyaId(contractDtos.get(0).getbPartyaId());
}
else{//鍐欏叆浜�
- contractPartyaDto.setPartyA(importRoomFee.getPayerObjName());
+ contractPartyaDto.setIsPartyA(importRoomFee.getPayerObjName());
}
List<ContractPartyaDto> contractPartyaDtos = iContractPartyaInnerServiceSMO.queryContractPartyas(contractPartyaDto);
if (ListUtil.isNull(contractPartyaDtos)) {
@@ -302,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()));
@@ -311,6 +322,10 @@
throw new RuntimeException("瀵煎叆璧峰鏃堕棿寮傚父");
}
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){
throw new IllegalArgumentException("閲嶅鐨勮垂鐢�");
@@ -322,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());
@@ -432,7 +447,11 @@
PayFeeDetailRefreshFeeMonthDto payFeeDetailRefreshFeeMonthDto = new PayFeeDetailRefreshFeeMonthDto();
payFeeDetailRefreshFeeMonthDto.setCommunityId(importRoomFee.getCommunityId());
payFeeDetailRefreshFeeMonthDto.setFeeId(payFeePos.get(0).getFeeId());
- payFeeMonthInnerServiceSMOImpl.doGeneratorOrRefreshFeeMonth(payFeeDetailRefreshFeeMonthDto);
+ try {
+ payFeeMonthInnerServiceSMOImpl.doGeneratorOrRefreshFeeMonth(payFeeDetailRefreshFeeMonthDto);
+ }catch (Exception e){
+
+ }
}
private void saveImportFee(ImportRoomFee importRoomFee, PayFeePo payFeePo) {
--
Gitblit v1.8.0