From b278a4b743d0cf45fd0b42bc78ff42f4e1124baf Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 19 十月 2021 12:20:04 +0800
Subject: [PATCH] 优化diamante

---
 java110-bean/src/main/java/com/java110/dto/reportFeeMonthStatistics/ReportFeeMonthStatisticsDto.java |  319 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 318 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
old mode 100644
new mode 100755
index 0caebd4..b88f7d1
--- 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
@@ -28,8 +30,11 @@
     private String objId;
     private String feeName;
     private String oweAmount;
+    private String curOweAmount;
     private String communityId;
     private String feeCreateTime;
+    private String feeStartTime;
+    private String feeEndTime;
     private String objType;
     private String floorId;
     private String floorNum;
@@ -38,9 +43,13 @@
     private String roomId;
     private String roomNum;
     private String carNum;
+    private String contractCode;
     private String payerObjType;
+    private String ownerName;
+    private String detailId;
 
     private String objCount;
+    private String normalCount;
 
 
     private Date createTime;
@@ -50,8 +59,70 @@
     private String statusCd = "0";
 
     private int oweDay;
+    private String deadlineTime;
 
+    private String curMaxTime;
+    private String importFeeName;
 
+    private String oId;
+
+    //鏀粯鏂瑰紡
+    private String primeRate;
+
+    //搴旀敹鎬婚噾棰�(灏忚)
+    private String totalReceivableAmount;
+
+    //瀹炴敹鎬婚噾棰�(灏忚)
+    private String totalReceivedAmount;
+
+    //搴旀敹鎬婚噾棰�(澶ц)
+    private String allReceivableAmount;
+
+    //瀹炴敹鎬婚噾棰�(澶ц)
+    private String allReceivedAmount;
+
+    //瀹炴敹鎬婚噾棰�(澶ц)
+    private String allOweAmount;
+
+    private List<FeeConfigDto> FeeConfigDtos;
+
+    //璐圭敤绫诲瀷
+    private String feeTypeCd;
+
+    //璐圭敤绫诲瀷鍚嶇О
+    private String feeTypeCdName;
+
+    //鎵撴姌閲戦锛堝寘鎷墦鎶樸�佸噺鍏嶃�佹粸绾抽噾銆佺┖缃埧鎵撴姌銆佺┖缃埧鍑忓厤閲戦绛夛級
+    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;
+
+    //鏀惰垂鐜�
+    private String chargeRate;
+
+    //鐘舵��
+    private String state;
+
+    //鐘舵�佸悕绉�
+    private String stateName;
+
+    private String repairId;
 
     public String getReceivableAmount() {
         return receivableAmount;
@@ -173,6 +244,22 @@
         this.feeCreateTime = feeCreateTime;
     }
 
+    public String getFeeStartTime() {
+        return feeStartTime;
+    }
+
+    public void setFeeStartTime(String feeStartTime) {
+        this.feeStartTime = feeStartTime;
+    }
+
+    public String getFeeEndTime() {
+        return feeEndTime;
+    }
+
+    public void setFeeEndTime(String feeEndTime) {
+        this.feeEndTime = feeEndTime;
+    }
+
     public String getObjType() {
         return objType;
     }
@@ -180,7 +267,6 @@
     public void setObjType(String objType) {
         this.objType = objType;
     }
-
 
     public Date getCreateTime() {
         return createTime;
@@ -293,4 +379,235 @@
     public void setPayerObjType(String payerObjType) {
         this.payerObjType = payerObjType;
     }
+
+    public String getDeadlineTime() {
+        return deadlineTime;
+    }
+
+    public void setDeadlineTime(String deadlineTime) {
+        this.deadlineTime = deadlineTime;
+    }
+
+    public String getImportFeeName() {
+        return importFeeName;
+    }
+
+    public void setImportFeeName(String importFeeName) {
+        this.importFeeName = importFeeName;
+    }
+
+    public String getNormalCount() {
+        return normalCount;
+    }
+
+    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;
+    }
+
+    public String getContractCode() {
+        return contractCode;
+    }
+
+    public void setContractCode(String contractCode) {
+        this.contractCode = contractCode;
+    }
+
+    public String getOwnerName() {
+        return ownerName;
+    }
+
+    public void setOwnerName(String ownerName) {
+        this.ownerName = ownerName;
+    }
+
+    public String getoId() {
+        return oId;
+    }
+
+    public void setoId(String oId) {
+        this.oId = oId;
+    }
+
+    public String getCurMaxTime() {
+        return curMaxTime;
+    }
+
+    public void setCurMaxTime(String curMaxTime) {
+        this.curMaxTime = curMaxTime;
+    }
+
+    public String getChargeRate() {
+        return chargeRate;
+    }
+
+    public void setChargeRate(String chargeRate) {
+        this.chargeRate = chargeRate;
+    }
+
+    public String getFeeTypeCdName() {
+        return feeTypeCdName;
+    }
+
+    public void setFeeTypeCdName(String feeTypeCdName) {
+        this.feeTypeCdName = feeTypeCdName;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getStateName() {
+        return stateName;
+    }
+
+    public void setStateName(String stateName) {
+        this.stateName = stateName;
+    }
+
+    public String getRepairId() {
+        return repairId;
+    }
+
+    public void setRepairId(String repairId) {
+        this.repairId = repairId;
+    }
+    public String getAllOweAmount() {
+        return allOweAmount;
+    }
+
+    public void setAllOweAmount(String allOweAmount) {
+        this.allOweAmount = allOweAmount;
+    }
+
+    public String getCurOweAmount() {
+        return curOweAmount;
+    }
+
+    public void setCurOweAmount(String curOweAmount) {
+        this.curOweAmount = curOweAmount;
+    }
+
+    public String getDetailId() {
+        return detailId;
+    }
+
+    public void setDetailId(String detailId) {
+        this.detailId = detailId;
+    }
 }

--
Gitblit v1.8.0