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 | 500 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 498 insertions(+), 2 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 36d0ecc..993fd2a
--- 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
@@ -20,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;
@@ -28,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;
@@ -37,8 +44,17 @@
private String unitNum;
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;
@@ -46,6 +62,87 @@
private String statusCd = "0";
+ 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;
+
+ //瀹炴敹鎬婚噾棰�(灏忚)
+ 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 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;
@@ -167,6 +264,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;
}
@@ -174,7 +287,6 @@
public void setObjType(String objType) {
this.objType = objType;
}
-
public Date getCreateTime() {
return createTime;
@@ -255,4 +367,388 @@
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 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