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 |  118 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 102 insertions(+), 16 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 2103d23..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;
@@ -43,15 +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;
@@ -69,6 +72,8 @@
 
     //鏀粯鏂瑰紡
     private String primeRate;
+
+    private double configReceivedAmount = 0;
 
     //搴旀敹鎬婚噾棰�(灏忚)
     private String totalReceivableAmount;
@@ -114,6 +119,9 @@
     //绌虹疆鎴垮噺鍏嶉噾棰�
     private String vacantHousingReduction;
 
+    //璧犻�侀噾棰�
+    private String giftAmount;
+
     //鏀惰垂鐜�
     private String chargeRate;
 
@@ -125,11 +133,16 @@
 
     private String repairId;
 
-    private String hisOweAmount;
-    private String curReceivableAmount;
-    private String curReceivedAmount;
-    private String hisOweReceivedAmount;
-    private String preReceivedAmount;
+    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;
@@ -594,6 +607,7 @@
     public void setRepairId(String repairId) {
         this.repairId = repairId;
     }
+
     public String getAllOweAmount() {
         return allOweAmount;
     }
@@ -626,43 +640,115 @@
         this.builtUpArea = builtUpArea;
     }
 
-    public String getHisOweAmount() {
+    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(String hisOweAmount) {
+    public void setHisOweAmount(double hisOweAmount) {
         this.hisOweAmount = hisOweAmount;
     }
 
-    public String getCurReceivableAmount() {
+    public double getCurReceivableAmount() {
         return curReceivableAmount;
     }
 
-    public void setCurReceivableAmount(String curReceivableAmount) {
+    public void setCurReceivableAmount(double curReceivableAmount) {
         this.curReceivableAmount = curReceivableAmount;
     }
 
-    public String getCurReceivedAmount() {
+    public double getCurReceivedAmount() {
         return curReceivedAmount;
     }
 
-    public void setCurReceivedAmount(String curReceivedAmount) {
+    public void setCurReceivedAmount(double curReceivedAmount) {
         this.curReceivedAmount = curReceivedAmount;
     }
 
-    public String getHisOweReceivedAmount() {
+    public double getHisOweReceivedAmount() {
         return hisOweReceivedAmount;
     }
 
-    public void setHisOweReceivedAmount(String hisOweReceivedAmount) {
+    public void setHisOweReceivedAmount(double hisOweReceivedAmount) {
         this.hisOweReceivedAmount = hisOweReceivedAmount;
     }
 
-    public String getPreReceivedAmount() {
+    public double getPreReceivedAmount() {
         return preReceivedAmount;
     }
 
-    public void setPreReceivedAmount(String 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