合并0819

chengf

2025-08-19 3066c7757f70878e8c495421de5de33e0f612fba

合并0819

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

@@ -101,12 +101,24 @@
    private String deductionAmount;
    private String lateAmount;
    private String giftAmount;
    //发票号或者收据号
    //发票号
    private String invoiceNo;

    //收据号
    private String receiptNo;

    //转账人
    private String transferorName;

    private String contractFee;
    public String getReceiptNo() {
        return receiptNo;
    }

    public void setReceiptNo(String receiptNo) {
        this.receiptNo = receiptNo;
    }

    public String getPrimeRate() {
        return primeRate;
    }

 java110-bean/src/main/java/com/java110/dto/owner/OwnerDto.java

@@ -55,6 +55,7 @@
    private String nameLike;
    private String link;
    private String address;
    private String otherAddress;
    private String remark;
    private String ownerId;
    private String[] ownerIds;
@@ -129,6 +130,13 @@
    private String concactLink;
    private String faceUrl;

    public String getOtherAddress() {
        return otherAddress;
    }

    public void setOtherAddress(String otherAddress) {
        this.otherAddress = otherAddress;
    }

    public String getSex() {
        return sex;

 java110-bean/src/main/java/com/java110/po/fee/PayFeeDetailPo.java

@@ -46,12 +46,22 @@
    private String lateAmount = "0";
    private String giftAmount = "0";

    //发票号或者收据号
    //发票号
    private String invoiceNo;

    //收据号
    private String receiptNo;

    //转账人
    private String transferorName;

    public String getReceiptNo() {
        return receiptNo;
    }

    public void setReceiptNo(String receiptNo) {
        this.receiptNo = receiptNo;
    }

    public String getDetailId() {
        return detailId;

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

@@ -65,8 +65,18 @@
    private String deductionAmount;
    private String lateAmount;
    private String giftAmount;
    //发票号或者收据号
    //发票号
    private String invoiceNo;
    //收据号
    private String receiptNo;

    public String getReceiptNo() {
        return receiptNo;
    }

    public void setReceiptNo(String receiptNo) {
        this.receiptNo = receiptNo;
    }

    //转账人
    private String transferorName;

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

@@ -8,14 +8,14 @@
        insert into pay_fee_detail(
        prime_rate,detail_id,receivable_amount,cycles,remark,start_time,received_amount,state,end_time,community_id,
        fee_id,b_id,payable_amount,pay_order_id,cashier_id,cashier_name,open_invoice,
        acct_amount,discount_amount,deduction_amount,late_amount,gift_amount,invoice_no,transferor_name
        acct_amount,discount_amount,deduction_amount,late_amount,gift_amount,invoice_no,receipt_no,transferor_name
        <if test="createTime != null">
            ,create_time
        </if>
        ) values (
        #{primeRate},#{detailId},#{receivableAmount},#{cycles},#{remark},#{startTime},#{receivedAmount},#{state},#{endTime},#{communityId},
        #{feeId},#{bId},#{payableAmount},#{payOrderId},#{cashierId},#{cashierName},#{openInvoice},
        #{acctAmount},#{discountAmount},#{deductionAmount},#{lateAmount},#{giftAmount},#{invoiceNo},#{transferorName}
        #{acctAmount},#{discountAmount},#{deductionAmount},#{lateAmount},#{giftAmount},#{invoiceNo},#{receiptNo},#{transferorName}
        <if test="createTime != null">
            ,#{createTime}
        </if>
@@ -30,7 +30,7 @@
        receivedAmount,t.state,t.end_time,t.end_time endTime,t.community_id,t.community_id communityId,t.fee_id,t.fee_id
        feeId,t.payable_amount,t.payable_amount payableAmount,t.pay_order_id payOrderId,t.cashier_id
        cashierId,t.cashier_name cashierName,t.open_invoice openInvoice,t.acct_amount acctAmount,t.discount_amount discountAmount,t.deduction_amount deductionAmount,
        t.late_amount lateAmount,t.gift_amount giftAmount,t.invoice_no invoiceNo,t.transferor_name transferorName
        t.late_amount lateAmount,t.gift_amount giftAmount,t.invoice_no invoiceNo,t.receipt_no receiptNo,t.transferor_name transferorName
        from pay_fee_detail t
        where 1 =1
        <if test="primeRate !=null and primeRate != ''">
@@ -138,6 +138,9 @@
        <if test="invoiceNo !=null and invoiceNo != ''">
            , t.invoice_no= #{invoiceNo}
        </if>
        <if test="receiptNo !=null and receiptNo != ''">
            , t.receipt_no= #{receiptNo}
        </if>
        <if test="transferorName !=null and transferorName != ''">
            , t.transferor_name= #{transferorName}
        </if>

 java110-interface/src/main/java/com/java110/intf/user/IOwnerCarInnerServiceSMO.java

@@ -32,7 +32,7 @@
     */
    @RequestMapping(value = "/queryOwnerCars", method = RequestMethod.POST)
    List<OwnerCarDto> queryOwnerCars(@RequestBody OwnerCarDto ownerCarDto);

gredge
    /**
     * 查询<p>小区楼</p>总记录数
     *

 service-fee/src/main/java/com/java110/fee/cmd/fee/ReportFeeCmd.java

@@ -62,28 +62,32 @@
        dictDto.setTableColumns("fee_type_cd");
        List<DictDto> dictDtos = dictV1InnerServiceSMOImpl.queryDicts(dictDto);
        int doYear = endYear - startYear;
        List<FeeDto> reportFeeDtos = new ArrayList<>();
        for (int i = startYear; i <= endYear; i++) {
            for (Map map : result) {
                if (map.get("统计周期")!=null&&map.get("统计周期").equals(i)){
        List<List<FeeDto>> reportFeeDtoLists = new ArrayList<>();
        for (DictDto dictDto1 : dictDtos) {//类型
            List<FeeDto> reportFeeDtos = new ArrayList<>();
            for (int i = startYear; i <= endYear; i++) {
                for (Map map : result) {
                    FeeDto feeDto = new FeeDto();
                    feeDto.setCurYear((i)+"");
                    feeDto.setFeeTypeCdName(map.get("费用类型名称")+"");
                    double[] doubles = new double[doYear];
                    for (int j = startYear ; j <= endYear ; j++) {
                        if(map.get((j)+"年收费金额(元)")!=null){
                            doubles[j-startYear] = ((BigDecimal)map.get((j)+"年收费金额(元)")).doubleValue();
                    if (map.get("统计周期")!=null&&map.get("统计周期").equals(i)&&map.get("费用类型编码").equals(dictDto1.getStatusCd())){
                        feeDto.setCurYear((i)+"");
                        feeDto.setFeeTypeCdName(map.get("费用类型名称")+"");
                        double[] doubles = new double[doYear];
                        for (int j = startYear ; j <= endYear ; j++) {
                            if(map.get((j)+"年收费金额(元)")!=null){
                                doubles[j-startYear] = ((BigDecimal)map.get((j)+"年收费金额(元)")).doubleValue();
                            }
                        }
                        feeDto.setReport(doubles);
                    }
                    feeDto.setReport(doubles);
                    reportFeeDtos.add(feeDto);
                }
            }
            reportFeeDtoLists.add(reportFeeDtos);
        }



        ResultVo resultVo = new ResultVo(reportFeeDtos);
        ResultVo resultVo = new ResultVo(reportFeeDtoLists);

        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);