From cf7052bd8f8516516d6f424b4df35c6329ee1d16 Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期五, 05 九月 2025 09:22:55 +0800
Subject: [PATCH] 报表完善0905
---
service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportCustomCreateFeeSMOImpl.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportCustomCreateFeeSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportCustomCreateFeeSMOImpl.java
index a456404..e21145c 100644
--- a/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportCustomCreateFeeSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportCustomCreateFeeSMOImpl.java
@@ -213,7 +213,7 @@
if (!ImportCustomCreateFeeDto.TYPE_ROOM.equals(importCustomCreateFeeDto.getObjType())) {
continue;
}
- objNames = importCustomCreateFeeDto.getObjName().split("-");
+ objNames = importCustomCreateFeeDto.getObjName().split("-",3);
if (objNames.length != 3) {
continue;
}
@@ -237,7 +237,13 @@
ownerDto.setRoomIds(roomIds.toArray(new String[roomIds.size()]));
List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnersByRoom(ownerDto);
for (ImportCustomCreateFeeDto importRoomFee : importCustomCreateFeeDtos) {
+ if(StringUtil.isEmpty(importRoomFee.getPayObjId())){
+ continue;
+ }
for (OwnerDto tmpOwnerDto : ownerDtos) {
+ if(StringUtil.isEmpty(tmpOwnerDto.getRoomId())){
+ continue;
+ }
if (importRoomFee.getPayObjId().equals(tmpOwnerDto.getRoomId())) {
importRoomFee.setOwnerId(tmpOwnerDto.getOwnerId());
importRoomFee.setOwnerName(tmpOwnerDto.getName());
@@ -268,7 +274,7 @@
}
successCount++;
payFeePo = new PayFeePo();
- payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId));
+ payFeePo.setFeeId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_feeId,true));
payFeePo.setEndTime(importRoomFee.getStartTime());
payFeePo.setState(FeeDto.STATE_DOING);
payFeePo.setCommunityId(importRoomFee.getCommunityId());
@@ -294,17 +300,24 @@
FeeAttrPo feeAttrPo = new FeeAttrPo();
feeAttrPo.setCommunityId(importRoomFee.getCommunityId());
- feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId,true));
feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_IMPORT_FEE_NAME);
feeAttrPo.setValue(feeConfigDtos.get(0).getFeeName());
feeAttrPo.setFeeId(payFeePo.getFeeId());
feeAttrPos.add(feeAttrPo);
+ feeAttrPo = new FeeAttrPo();
+ feeAttrPo.setCommunityId(importRoomFee.getCommunityId());
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId,true));
+ feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_PAY_OBJECT_NAME);
+ feeAttrPo.setValue(importRoomFee.getObjName());
+ feeAttrPo.setFeeId(payFeePo.getFeeId());
+ feeAttrPos.add(feeAttrPo);
if (!StringUtil.isEmpty(importRoomFee.getOwnerId())) {
feeAttrPo = new FeeAttrPo();
feeAttrPo.setCommunityId(importRoomFee.getCommunityId());
- feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId,true));
feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_ID);
feeAttrPo.setValue(importRoomFee.getOwnerId());
feeAttrPo.setFeeId(payFeePo.getFeeId());
@@ -312,7 +325,7 @@
feeAttrPo = new FeeAttrPo();
feeAttrPo.setCommunityId(importRoomFee.getCommunityId());
- feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId,true));
feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_NAME);
feeAttrPo.setValue(importRoomFee.getOwnerName());
feeAttrPo.setFeeId(payFeePo.getFeeId());
@@ -320,7 +333,7 @@
feeAttrPo = new FeeAttrPo();
feeAttrPo.setCommunityId(importRoomFee.getCommunityId());
- feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));
+ feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId,true));
feeAttrPo.setSpecCd(FeeAttrDto.SPEC_CD_OWNER_LINK);
feeAttrPo.setValue(importRoomFee.getOwnerLink());
feeAttrPo.setFeeId(payFeePo.getFeeId());
--
Gitblit v1.8.0