Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

Your Name

2023-07-03 2b919980a8c70554a64cb3d03cc95679af4d817f

Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

 java110-bean/src/main/java/com/java110/dto/fee/FeeDetailDto.java

@@ -85,6 +85,8 @@

    private String primeRateName;

    private String feeFlag;

    public String getPrimeRate() {
        return primeRate;
    }
@@ -396,4 +398,12 @@
    public void setCashierName(String cashierName) {
        this.cashierName = cashierName;
    }

    public String getFeeFlag() {
        return feeFlag;
    }

    public void setFeeFlag(String feeFlag) {
        this.feeFlag = feeFlag;
    }
}

 java110-bean/src/main/java/com/java110/dto/reportFee/ReportFeeMonthStatisticsDto.java

@@ -154,6 +154,8 @@
    private String cashierId;
    private String cashierName;

    private String feeFlag;


    public String getReceivableAmount() {
        return receivableAmount;
@@ -794,4 +796,12 @@
    public void setCashierName(String cashierName) {
        this.cashierName = cashierName;
    }

    public String getFeeFlag() {
        return feeFlag;
    }

    public void setFeeFlag(String feeFlag) {
        this.feeFlag = feeFlag;
    }
}

 java110-bean/src/main/java/com/java110/vo/api/ApiFeeDetailDataVo.java

@@ -51,6 +51,9 @@

    private String payerObjName;

    private String feeFlag;



    public String getPrimeRate() {
        return primeRate;
@@ -267,4 +270,12 @@
    public void setCashierName(String cashierName) {
        this.cashierName = cashierName;
    }

    public String getFeeFlag() {
        return feeFlag;
    }

    public void setFeeFlag(String feeFlag) {
        this.feeFlag = feeFlag;
    }
}

 java110-db/src/main/resources/mapper/fee/FeeDetailServiceDaoImplMapper.xml

@@ -122,7 +122,7 @@
        importFeeName,pfc.fee_name feeName,t.payable_amount,t.payable_amount payableAmount,
        mw.cur_degrees curDegrees,mw.pre_degrees preDegrees, mw.pre_reading_time preReadingTime,mw.cur_reading_time
        curReadingTime,t.pay_order_id payOrderId,pfc.config_id configId,td.`name` primeRateName,pfao1.`value` payerObjName,
        t.cashier_id cashierId,t.cashier_name cashierName
        t.cashier_id cashierId,t.cashier_name cashierName,pfc.fee_flag feeFlag
        from pay_fee_detail t
        left join pay_fee_attrs pfa on t.fee_id = pfa.fee_id and pfa.spec_cd = '390002'
        left join pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'

 java110-db/src/main/resources/mapper/report/ReportFeeMonthStatisticsServiceDaoImplMapper.xml

@@ -1750,7 +1750,7 @@
        ruleName,pfdd.discount_price discountPrice,co.contract_code contractCode,pfo.`value` ownerName,cb.o_id oId,
        d2.name feeTypeCdName,pfc.fee_type_cd feeTypeCd,t.state,d3.name stateName,t.fee_id feeId,pft.`value` repairId,
        t.detail_id,t.detail_id detailId,pf.payer_obj_id,pfb.value ownerId,concat(pa.num,'停车场',ps.num,'车位') psName,
        fad.amount withholdAmount,t.cashier_id cashierId,t.cashier_name cashierName,t.payable_amount payableAmount
        fad.amount withholdAmount,t.cashier_id cashierId,t.cashier_name cashierName,t.payable_amount payableAmount,pfc.fee_flag feeFlag
        from pay_fee_detail t
        left JOIN pay_fee pf on t.fee_id = pf.fee_id and pf.status_cd = '0'
        left join pay_fee_config pfc on pf.config_id = pfc.config_id and pfc.status_cd = '0'

 service-api/src/main/java/com/java110/api/smo/assetImport/impl/ImportOwnerCarSMOImpl.java

@@ -249,13 +249,16 @@
                throw new IllegalArgumentException(ownerCarDto.getCarNum()+"车位状态应填写 S（出售）或者 H （出租）");
            }


            OwnerDto ownerDto = new OwnerDto();
            ownerDto.setName(ownerCarDto.getOwnerName());
            ownerDto.setLink(ownerCarDto.getLink());
            ownerDto.setCommunityId(reqJson.getString("communityId"));
            //查询业主
            List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
            Assert.listOnlyOne(ownerDtos, ownerCarDto.getCarNum() + "查询业主信息错误！");
            //Assert.listOnlyOne(ownerDtos, ownerCarDto.getCarNum() + "查询业主信息错误！");
            if(ownerDtos == null || ownerDtos.size() < 1){
                throw new IllegalArgumentException("业主不存在");
            }
            ownerCarDto.setOwnerId(ownerDtos.get(0).getOwnerId());
        }


 service-fee/src/main/java/com/java110/fee/bmo/impl/ImportRoomFeeImpl.java

@@ -207,6 +207,7 @@
            feeAttrPo.setFeeId(payFeePo.getFeeId());
            feeAttrPos.add(feeAttrPo);

            //todo 插入截止时间
            feeAttrPo = new FeeAttrPo();
            feeAttrPo.setCommunityId(communityId);
            feeAttrPo.setAttrId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_attrId));

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

@@ -254,9 +254,13 @@
            OwnerDto ownerDto = new OwnerDto();
            ownerDto.setName(ownerCarDto.getOwnerName());
            ownerDto.setLink(ownerCarDto.getLink());
            ownerDto.setCommunityId(reqJson.getString("communityId"));
            //查询业主
            List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
            Assert.listOnlyOne(ownerDtos, ownerCarDto.getCarNum() + "查询业主信息错误！");
            //Assert.listOnlyOne(ownerDtos, ownerCarDto.getCarNum() + "查询业主信息错误！");
            if(ownerDtos == null || ownerDtos.size() < 1){
                throw new IllegalArgumentException("业主不存在");
            }
            ownerCarDto.setOwnerId(ownerDtos.get(0).getOwnerId());
        }