From dea2325896c7f8bd7df5107569b71d15fede79c7 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 22 九月 2022 20:11:55 +0800
Subject: [PATCH] 1、优化图片异步上传2、bug修复3、合同bug修复4、车场相关问题

---
 java110-bean/src/main/java/com/java110/dto/reportFeeMonthStatistics/ReportFeeMonthStatisticsDto.java |  252 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 251 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 5f46328..993fd2a 100755
--- a/java110-bean/src/main/java/com/java110/dto/reportFeeMonthStatistics/ReportFeeMonthStatisticsDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/reportFeeMonthStatistics/ReportFeeMonthStatisticsDto.java
@@ -22,7 +22,9 @@
     private String updateTime;
     private String remark;
     private String objName;
+    private String objNameNum;
     private String receivedAmount;
+    private String payableAmount;
     private String feeYear;
     private String feeMonth;
     private String feeId;
@@ -30,8 +32,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;
@@ -40,13 +45,16 @@
     private String roomId;
     private String roomNum;
     private String carNum;
+    private String psName;
     private String contractCode;
     private String payerObjType;
     private String ownerName;
+    private String ownerId;
+    private String detailId;
+    private String builtUpArea;
 
     private String objCount;
     private String normalCount;
-
 
     private Date createTime;
     private String startTime;
@@ -57,12 +65,15 @@
     private int oweDay;
     private String deadlineTime;
 
+    private String curMaxTime;
     private String importFeeName;
 
     private String oId;
 
     //鏀粯鏂瑰紡
     private String primeRate;
+
+    private double configReceivedAmount = 0;
 
     //搴旀敹鎬婚噾棰�(灏忚)
     private String totalReceivableAmount;
@@ -76,10 +87,16 @@
     //瀹炴敹鎬婚噾棰�(澶ц)
     private String allReceivedAmount;
 
+    //瀹炴敹鎬婚噾棰�(澶ц)
+    private String allOweAmount;
+
     private List<FeeConfigDto> FeeConfigDtos;
 
     //璐圭敤绫诲瀷
     private String feeTypeCd;
+
+    //璐圭敤绫诲瀷鍚嶇О
+    private String feeTypeCdName;
 
     //鎵撴姌閲戦锛堝寘鎷墦鎶樸�佸噺鍏嶃�佹粸绾抽噾銆佺┖缃埧鎵撴姌銆佺┖缃埧鍑忓厤閲戦绛夛級
     private String discountPrice;
@@ -101,6 +118,31 @@
 
     //绌虹疆鎴垮噺鍏嶉噾棰�
     private String vacantHousingReduction;
+
+    //璧犻�侀噾棰�
+    private String giftAmount;
+
+    //鏀惰垂鐜�
+    private String chargeRate;
+
+    //鐘舵��
+    private String state;
+
+    //鐘舵�佸悕绉�
+    private String stateName;
+
+    private String repairId;
+
+    private double hisOweAmount;
+    private double curReceivableAmount;
+    private double curReceivedAmount;
+    private double hisOweReceivedAmount;
+    private double preReceivedAmount;
+    private double allHisOweReceivedAmount;
+
+    private String[] configIds;
+
+    private String yearMonth;
 
     public String getReceivableAmount() {
         return receivableAmount;
@@ -220,6 +262,22 @@
 
     public void setFeeCreateTime(String feeCreateTime) {
         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() {
@@ -501,4 +559,196 @@
     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;
+    }
+
+    public String getBuiltUpArea() {
+        return builtUpArea;
+    }
+
+    public void setBuiltUpArea(String builtUpArea) {
+        this.builtUpArea = builtUpArea;
+    }
+
+    public String[] getConfigIds() {
+        return configIds;
+    }
+
+    public void setConfigIds(String[] configIds) {
+        this.configIds = configIds;
+    }
+
+    public double getConfigReceivedAmount() {
+        return configReceivedAmount;
+    }
+
+    public void setConfigReceivedAmount(double configReceivedAmount) {
+        this.configReceivedAmount = configReceivedAmount;
+    }
+
+    public double getHisOweAmount() {
+        return hisOweAmount;
+    }
+
+    public void setHisOweAmount(double hisOweAmount) {
+        this.hisOweAmount = hisOweAmount;
+    }
+
+    public double getCurReceivableAmount() {
+        return curReceivableAmount;
+    }
+
+    public void setCurReceivableAmount(double curReceivableAmount) {
+        this.curReceivableAmount = curReceivableAmount;
+    }
+
+    public double getCurReceivedAmount() {
+        return curReceivedAmount;
+    }
+
+    public void setCurReceivedAmount(double curReceivedAmount) {
+        this.curReceivedAmount = curReceivedAmount;
+    }
+
+    public double getHisOweReceivedAmount() {
+        return hisOweReceivedAmount;
+    }
+
+    public void setHisOweReceivedAmount(double hisOweReceivedAmount) {
+        this.hisOweReceivedAmount = hisOweReceivedAmount;
+    }
+
+    public double getPreReceivedAmount() {
+        return preReceivedAmount;
+    }
+
+    public void setPreReceivedAmount(double preReceivedAmount) {
+        this.preReceivedAmount = preReceivedAmount;
+    }
+
+    public String getYearMonth() {
+        return yearMonth;
+    }
+
+    public void setYearMonth(String yearMonth) {
+        this.yearMonth = yearMonth;
+    }
+
+    public double getAllHisOweReceivedAmount() {
+        return allHisOweReceivedAmount;
+    }
+
+    public void setAllHisOweReceivedAmount(double allHisOweReceivedAmount) {
+        this.allHisOweReceivedAmount = allHisOweReceivedAmount;
+    }
+
+    public String getOwnerId() {
+        return ownerId;
+    }
+
+    public void setOwnerId(String ownerId) {
+        this.ownerId = ownerId;
+    }
+
+    public String getPsName() {
+        return psName;
+    }
+
+    public void setPsName(String psName) {
+        this.psName = psName;
+    }
+
+    public String getObjNameNum() {
+        return objNameNum;
+    }
+
+    public void setObjNameNum(String objNameNum) {
+        this.objNameNum = objNameNum;
+    }
+
+    public String getGiftAmount() {
+        return giftAmount;
+    }
+
+    public void setGiftAmount(String giftAmount) {
+        this.giftAmount = giftAmount;
+    }
+
+    public String getPayableAmount() {
+        return payableAmount;
+    }
+
+    public void setPayableAmount(String payableAmount) {
+        this.payableAmount = payableAmount;
+    }
 }

--
Gitblit v1.8.0