From 597cae7743fde0ca86efb4659a2ded937fc308ae Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 19 一月 2021 00:32:28 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-bean/src/main/java/com/java110/dto/reportFeeMonthStatistics/ReportFeeMonthStatisticsDto.java |  153 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 152 insertions(+), 1 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/reportFeeMonthStatistics/ReportFeeMonthStatisticsDto.java b/java110-bean/src/main/java/com/java110/dto/reportFeeMonthStatistics/ReportFeeMonthStatisticsDto.java
index 9b0c3fc..68963e9 100644
--- a/java110-bean/src/main/java/com/java110/dto/reportFeeMonthStatistics/ReportFeeMonthStatisticsDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/reportFeeMonthStatistics/ReportFeeMonthStatisticsDto.java
@@ -1,9 +1,11 @@
 package com.java110.dto.reportFeeMonthStatistics;
 
 import com.java110.dto.PageDto;
+import com.java110.dto.fee.FeeConfigDto;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * @ClassName FloorDto
@@ -55,8 +57,46 @@
 
     private String importFeeName;
 
+    //鏀粯鏂瑰紡
+    private String primeRate;
 
+    //搴旀敹鎬婚噾棰�(灏忚)
+    private String totalReceivableAmount;
 
+    //瀹炴敹鎬婚噾棰�(灏忚)
+    private String totalReceivedAmount;
+
+    //搴旀敹鎬婚噾棰�(澶ц)
+    private String allReceivableAmount;
+
+    //瀹炴敹鎬婚噾棰�(澶ц)
+    private String allReceivedAmount;
+
+    private List<FeeConfigDto> FeeConfigDtos;
+
+    //璐圭敤绫诲瀷
+    private String feeTypeCd;
+
+    //鎵撴姌閲戦锛堝寘鎷墦鎶樸�佸噺鍏嶃�佹粸绾抽噾銆佺┖缃埧鎵撴姌銆佺┖缃埧鍑忓厤閲戦绛夛級
+    private String discountPrice;
+
+    //1:鎵撴姌 2:鍑忓厤 3:婊炵撼閲� 4:绌虹疆鎴挎墦鎶� 5:绌虹疆鎴垮噺鍏�
+    private String discountSmallType;
+
+    //浼樻儬閲戦
+    private String preferentialAmount;
+
+    //鍑忓厤閲戦
+    private String deductionAmount;
+
+    //婊炵撼閲�
+    private String lateFee;
+
+    //绌虹疆鎴挎墦鎶橀噾棰�
+    private String vacantHousingDiscount;
+
+    //绌虹疆鎴垮噺鍏嶉噾棰�
+    private String vacantHousingReduction;
 
     public String getReceivableAmount() {
         return receivableAmount;
@@ -185,7 +225,6 @@
     public void setObjType(String objType) {
         this.objType = objType;
     }
-
 
     public Date getCreateTime() {
         return createTime;
@@ -322,4 +361,116 @@
     public void setNormalCount(String normalCount) {
         this.normalCount = normalCount;
     }
+
+    public String getTotalReceivableAmount() {
+        return totalReceivableAmount;
+    }
+
+    public void setTotalReceivableAmount(String totalReceivableAmount) {
+        this.totalReceivableAmount = totalReceivableAmount;
+    }
+
+    public String getTotalReceivedAmount() {
+        return totalReceivedAmount;
+    }
+
+    public void setTotalReceivedAmount(String totalReceivedAmount) {
+        this.totalReceivedAmount = totalReceivedAmount;
+    }
+
+    public String getAllReceivableAmount() {
+        return allReceivableAmount;
+    }
+
+    public void setAllReceivableAmount(String allReceivableAmount) {
+        this.allReceivableAmount = allReceivableAmount;
+    }
+
+    public String getAllReceivedAmount() {
+        return allReceivedAmount;
+    }
+
+    public void setAllReceivedAmount(String allReceivedAmount) {
+        this.allReceivedAmount = allReceivedAmount;
+    }
+
+    public List<FeeConfigDto> getFeeConfigDtos() {
+        return FeeConfigDtos;
+    }
+
+    public void setFeeConfigDtos(List<FeeConfigDto> feeConfigDtoS) {
+        FeeConfigDtos = feeConfigDtoS;
+    }
+
+    public String getPrimeRate() {
+        return primeRate;
+    }
+
+    public void setPrimeRate(String primeRate) {
+        this.primeRate = primeRate;
+    }
+
+    public String getFeeTypeCd() {
+        return feeTypeCd;
+    }
+
+    public void setFeeTypeCd(String feeTypeCd) {
+        this.feeTypeCd = feeTypeCd;
+    }
+
+    public String getPreferentialAmount() {
+        return preferentialAmount;
+    }
+
+    public void setPreferentialAmount(String preferentialAmount) {
+        this.preferentialAmount = preferentialAmount;
+    }
+
+    public String getDeductionAmount() {
+        return deductionAmount;
+    }
+
+    public void setDeductionAmount(String deductionAmount) {
+        this.deductionAmount = deductionAmount;
+    }
+
+    public String getLateFee() {
+        return lateFee;
+    }
+
+    public void setLateFee(String lateFee) {
+        this.lateFee = lateFee;
+    }
+
+    public String getDiscountSmallType() {
+        return discountSmallType;
+    }
+
+    public void setDiscountSmallType(String discountSmallType) {
+        this.discountSmallType = discountSmallType;
+    }
+
+    public String getDiscountPrice() {
+        return discountPrice;
+    }
+
+    public void setDiscountPrice(String discountPrice) {
+        this.discountPrice = discountPrice;
+    }
+
+    public String getVacantHousingDiscount() {
+        return vacantHousingDiscount;
+    }
+
+    public void setVacantHousingDiscount(String vacantHousingDiscount) {
+        this.vacantHousingDiscount = vacantHousingDiscount;
+    }
+
+    public String getVacantHousingReduction() {
+        return vacantHousingReduction;
+    }
+
+    public void setVacantHousingReduction(String vacantHousingReduction) {
+        this.vacantHousingReduction = vacantHousingReduction;
+    }
 }

--
Gitblit v1.8.0