From 6e8c95d31d85b53857e4e3ce12ea303eb0ea42eb Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 19 八月 2021 00:47:48 +0800
Subject: [PATCH] 优化代码

---
 java110-bean/src/main/java/com/java110/dto/reportFeeMonthStatistics/ReportFeeMonthStatisticsDto.java |  540 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 491 insertions(+), 49 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 3cbebee..36f72b3
--- 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,8 +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
@@ -15,125 +18,252 @@
 public class ReportFeeMonthStatisticsDto extends PageDto implements Serializable {
 
     private String receivableAmount;
-private String statisticsId;
-private String updateTime;
-private String remark;
-private String objName;
-private String receivedAmount;
-private String feeYear;
-private String feeMonth;
-private String feeId;
-private String configId;
-private String objId;
-private String feeName;
-private String oweAmount;
-private String communityId;
-private String feeCreateTime;
-private String objType;
+    private String statisticsId;
+    private String updateTime;
+    private String remark;
+    private String objName;
+    private String receivedAmount;
+    private String feeYear;
+    private String feeMonth;
+    private String feeId;
+    private String configId;
+    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;
+    private String unitId;
+    private String unitNum;
+    private String roomId;
+    private String roomNum;
+    private String carNum;
+    private String contractCode;
+    private String payerObjType;
+    private String ownerName;
+
+    private String objCount;
+    private String normalCount;
 
 
     private Date createTime;
+    private String startTime;
+    private String endTime;
 
     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;
 
     public String getReceivableAmount() {
         return receivableAmount;
     }
-public void setReceivableAmount(String receivableAmount) {
+
+    public void setReceivableAmount(String receivableAmount) {
         this.receivableAmount = receivableAmount;
     }
-public String getStatisticsId() {
+
+    public String getStatisticsId() {
         return statisticsId;
     }
-public void setStatisticsId(String statisticsId) {
+
+    public void setStatisticsId(String statisticsId) {
         this.statisticsId = statisticsId;
     }
-public String getUpdateTime() {
+
+    public String getUpdateTime() {
         return updateTime;
     }
-public void setUpdateTime(String updateTime) {
+
+    public void setUpdateTime(String updateTime) {
         this.updateTime = updateTime;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getObjName() {
+
+    public String getObjName() {
         return objName;
     }
-public void setObjName(String objName) {
+
+    public void setObjName(String objName) {
         this.objName = objName;
     }
-public String getReceivedAmount() {
+
+    public String getReceivedAmount() {
         return receivedAmount;
     }
-public void setReceivedAmount(String receivedAmount) {
+
+    public void setReceivedAmount(String receivedAmount) {
         this.receivedAmount = receivedAmount;
     }
-public String getFeeYear() {
+
+    public String getFeeYear() {
         return feeYear;
     }
-public void setFeeYear(String feeYear) {
+
+    public void setFeeYear(String feeYear) {
         this.feeYear = feeYear;
     }
-public String getFeeMonth() {
+
+    public String getFeeMonth() {
         return feeMonth;
     }
-public void setFeeMonth(String feeMonth) {
+
+    public void setFeeMonth(String feeMonth) {
         this.feeMonth = feeMonth;
     }
-public String getFeeId() {
+
+    public String getFeeId() {
         return feeId;
     }
-public void setFeeId(String feeId) {
+
+    public void setFeeId(String feeId) {
         this.feeId = feeId;
     }
-public String getConfigId() {
+
+    public String getConfigId() {
         return configId;
     }
-public void setConfigId(String configId) {
+
+    public void setConfigId(String configId) {
         this.configId = configId;
     }
-public String getObjId() {
+
+    public String getObjId() {
         return objId;
     }
-public void setObjId(String objId) {
+
+    public void setObjId(String objId) {
         this.objId = objId;
     }
-public String getFeeName() {
+
+    public String getFeeName() {
         return feeName;
     }
-public void setFeeName(String feeName) {
+
+    public void setFeeName(String feeName) {
         this.feeName = feeName;
     }
-public String getOweAmount() {
+
+    public String getOweAmount() {
         return oweAmount;
     }
-public void setOweAmount(String oweAmount) {
+
+    public void setOweAmount(String oweAmount) {
         this.oweAmount = oweAmount;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getFeeCreateTime() {
+
+    public String getFeeCreateTime() {
         return feeCreateTime;
     }
-public void setFeeCreateTime(String feeCreateTime) {
+
+    public void setFeeCreateTime(String feeCreateTime) {
         this.feeCreateTime = feeCreateTime;
     }
-public String getObjType() {
-        return objType;
-    }
-public void setObjType(String objType) {
-        this.objType = objType;
+
+    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;
+    }
+
+    public void setObjType(String objType) {
+        this.objType = objType;
+    }
 
     public Date getCreateTime() {
         return createTime;
@@ -150,4 +280,316 @@
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getFloorId() {
+        return floorId;
+    }
+
+    public void setFloorId(String floorId) {
+        this.floorId = floorId;
+    }
+
+    public String getFloorNum() {
+        return floorNum;
+    }
+
+    public void setFloorNum(String floorNum) {
+        this.floorNum = floorNum;
+    }
+
+    public String getUnitId() {
+        return unitId;
+    }
+
+    public void setUnitId(String unitId) {
+        this.unitId = unitId;
+    }
+
+    public String getUnitNum() {
+        return unitNum;
+    }
+
+    public void setUnitNum(String unitNum) {
+        this.unitNum = unitNum;
+    }
+
+    public String getRoomId() {
+        return roomId;
+    }
+
+    public void setRoomId(String roomId) {
+        this.roomId = roomId;
+    }
+
+    public String getRoomNum() {
+        return roomNum;
+    }
+
+    public void setRoomNum(String roomNum) {
+        this.roomNum = roomNum;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
+
+    public int getOweDay() {
+        return oweDay;
+    }
+
+    public void setOweDay(int oweDay) {
+        this.oweDay = oweDay;
+    }
+
+    public String getObjCount() {
+        return objCount;
+    }
+
+    public void setObjCount(String objCount) {
+        this.objCount = objCount;
+    }
+
+    public String getCarNum() {
+        return carNum;
+    }
+
+    public void setCarNum(String carNum) {
+        this.carNum = carNum;
+    }
+
+    public String getPayerObjType() {
+        return payerObjType;
+    }
+
+    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 getAllOweAmount() {
+        return allOweAmount;
+    }
+
+    public void setAllOweAmount(String allOweAmount) {
+        this.allOweAmount = allOweAmount;
+    }
+
+    public String getCurOweAmount() {
+        return curOweAmount;
+    }
+
+    public void setCurOweAmount(String curOweAmount) {
+        this.curOweAmount = curOweAmount;
+    }
 }

--
Gitblit v1.8.0