解决

wuxw

2023-07-02 6cddb02c742dbdd67e436dbfa60fe6dcb08e51e6

 springboot/src/main/java/com/java110/boot/smo/assetImport/impl/ImportCustomCreateFeeSMOImpl.java

@@ -13,10 +13,10 @@
import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.owner.OwnerDto;
import com.java110.dto.payFeeBatch.PayFeeBatchDto;
import com.java110.dto.payFee.PayFeeBatchDto;
import com.java110.dto.user.UserDto;
import com.java110.entity.assetImport.ImportCustomCreateFeeDto;
import com.java110.entity.component.ComponentValidateResult;
import com.java110.dto.importData.ImportCustomCreateFeeDto;
import com.java110.dto.system.ComponentValidateResult;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.fee.IFeeAttrInnerServiceSMO;
import com.java110.intf.fee.IFeeInnerServiceSMO;
@@ -27,8 +27,8 @@
import com.java110.intf.user.IUserInnerServiceSMO;
import com.java110.po.fee.FeeAttrPo;
import com.java110.po.fee.PayFeePo;
import com.java110.po.importFeeDetail.ImportFeeDetailPo;
import com.java110.po.payFeeBatch.PayFeeBatchPo;
import com.java110.po.importFee.ImportFeeDetailPo;
import com.java110.po.payFee.PayFeeBatchPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.ImportExcelUtils;
@@ -151,16 +151,16 @@
            tmpImportCustomCreateFeeDtos.add(importCustomCreateFeeDtos.get(roomIndex));
            if (roomIndex % DEFAULT_ADD_FEE_COUNT == 0 && roomIndex != 0) {
                // 处理房屋费用
                doImportRoomCreateFee(importCustomCreateFeeDtos, batchId, result);
                doImportCarCreateFee(importCustomCreateFeeDtos, batchId, result);
                doImportRoomCreateFee(tmpImportCustomCreateFeeDtos, batchId, result);
                doImportCarCreateFee(tmpImportCustomCreateFeeDtos, batchId, result);

                tmpImportCustomCreateFeeDtos = new ArrayList<>();
            }
        }
        if (tmpImportCustomCreateFeeDtos != null && tmpImportCustomCreateFeeDtos.size() > 0) {

            doImportRoomCreateFee(importCustomCreateFeeDtos, batchId, result);
            doImportCarCreateFee(importCustomCreateFeeDtos, batchId, result);
            doImportRoomCreateFee(tmpImportCustomCreateFeeDtos, batchId, result);
            doImportCarCreateFee(tmpImportCustomCreateFeeDtos, batchId, result);

        }

@@ -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());
@@ -274,7 +280,13 @@
            payFeePo.setCommunityId(importRoomFee.getCommunityId());
            payFeePo.setConfigId(importRoomFee.getConfigId());
            payFeePo.setPayerObjId(importRoomFee.getPayObjId());
            payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
            if("3003".equals(importRoomFee.getObjType())) {
                payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_CONTRACT);
            }else if("2002".equals(importRoomFee.getObjType())) {
                payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_CAR);
            }else{
                payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
            }
            payFeePo.setUserId(result.getUserId());
            payFeePo.setIncomeObjId(result.getStoreId());
            payFeePo.setFeeTypeCd(feeConfigDtos.get(0).getFeeTypeCd());