From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java | 254 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 252 insertions(+), 2 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java b/java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java
old mode 100644
new mode 100755
index 7e8375d..24a8e75
--- a/java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java
@@ -4,6 +4,7 @@
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
/**
* @ClassName FloorDto
@@ -20,11 +21,17 @@
public static final String PAYER_OBJ_TYPE_ROOM = "3333"; //鎴垮眿 6666 鏄溅浣�
public static final String PAYER_OBJ_TYPE_PARKING_SPACE = "6666";//鏄溅浣�
+ public static final String PAYER_OBJ_TYPE_CONTRACT = "7777";//鏄悎鍚�
+ public static final String PAYER_OBJ_TYPE_CAR = "6666";//鏄溅浣�
+ public static final String PAYER_OBJ_TYPE_RENTING = "9999";//鎴挎簮ID
- public static final String FEE_FLAG_ONCE = "2006012";
+ public static final String FEE_FLAG_ONCE = "2006012";//涓�娆℃�ц垂鐢�
+ public static final String FEE_FLAG_CYCLE = "1003006";//鍛ㄦ湡鎬ц垂鐢�
+ public static final String REDIS_PAY_OWE_FEE = "PAY_OWE_FEE_";
private String amount;
private String incomeObjId;
+ private String incomeObjName;
private String feeTypeCd;
private Date startTime;
private Date endTime;
@@ -37,7 +44,14 @@
private String[] feeTypeCds;
private String configId;
+ //鏄犲皠鍏崇郴寮�鍏冲��
+ private String val;
+
+ //瀹炴敹閲戦鏄犲皠寮�鍏冲��
+ private String receivedAmountSwitch;
+
private String squarePrice;
+ private String mwPrice;
private String additionalAmount;
private String state;
private String stateName;
@@ -52,18 +66,33 @@
private double feePrice;
private String payerObjType;
private String computingFormula;
+ private String computingFormulaText;
private String isDefault;
private double oweFee; // 娆犺垂閲戦
private String billType;
+ private String billTypeName;
+ private String builtUpArea;
private String paymentCd;
private String paymentCycle;
private String bId;
+ private String importFeeName;
+
+ private String amountOwed;
+
+ private String roomName;
+
+ private String ownerName;
+
+ private String ownerTel;
+
+ private String ownerId;
private Date createTime;
+
private String statusCd = "0";
@@ -76,6 +105,28 @@
*/
private Date configEndTime;
+ private Date deadlineTime;
+
+ private Date importFeeEndTime;
+
+
+ private String curDegrees;
+ private String preDegrees;
+
+ private Date preReadingTime;
+ private Date curReadingTime;
+
+ private List<FeeAttrDto> feeAttrDtos;
+
+ //褰撳墠鏃堕棿
+ private Date nowDate;
+
+ //鏌ヨ鍑虹殑鏁伴噺
+ private int count;
+
+ private String carTypeCd;
+ private String cycle;
+ private double feeTotalPrice;
public String getAmount() {
return amount;
@@ -165,7 +216,6 @@
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
-
public Date getArrearsEndTime() {
return arrearsEndTime;
@@ -366,4 +416,204 @@
public void setBillType(String billType) {
this.billType = billType;
}
+
+ public String getBillTypeName() {
+ return billTypeName;
+ }
+
+ public void setBillTypeName(String billTypeName) {
+ this.billTypeName = billTypeName;
+ }
+
+ public String getImportFeeName() {
+ return importFeeName;
+ }
+
+ public void setImportFeeName(String importFeeName) {
+ this.importFeeName = importFeeName;
+ }
+
+ public String getAmountOwed() {
+ return amountOwed;
+ }
+
+ public void setAmountOwed(String amountOwed) {
+ this.amountOwed = amountOwed;
+ }
+
+ public String getRoomName() {
+ return roomName;
+ }
+
+ public void setRoomName(String roomName) {
+ this.roomName = roomName;
+ }
+
+ public String getOwnerName() {
+ return ownerName;
+ }
+
+ public void setOwnerName(String ownerName) {
+ this.ownerName = ownerName;
+ }
+
+ public String getOwnerTel() {
+ return ownerTel;
+ }
+
+ public void setOwnerTel(String ownerTel) {
+ this.ownerTel = ownerTel;
+ }
+
+ public Date getDeadlineTime() {
+ return deadlineTime;
+ }
+
+ public void setDeadlineTime(Date deadlineTime) {
+ this.deadlineTime = deadlineTime;
+ }
+
+ public Date getImportFeeEndTime() {
+ return importFeeEndTime;
+ }
+
+ public void setImportFeeEndTime(Date importFeeEndTime) {
+ this.importFeeEndTime = importFeeEndTime;
+ }
+
+ public String getCurDegrees() {
+ return curDegrees;
+ }
+
+ public void setCurDegrees(String curDegrees) {
+ this.curDegrees = curDegrees;
+ }
+
+ public String getPreDegrees() {
+ return preDegrees;
+ }
+
+ public void setPreDegrees(String preDegrees) {
+ this.preDegrees = preDegrees;
+ }
+
+ public Date getPreReadingTime() {
+ return preReadingTime;
+ }
+
+ public void setPreReadingTime(Date preReadingTime) {
+ this.preReadingTime = preReadingTime;
+ }
+
+ public Date getCurReadingTime() {
+ return curReadingTime;
+ }
+
+ public void setCurReadingTime(Date curReadingTime) {
+ this.curReadingTime = curReadingTime;
+ }
+
+ public List<FeeAttrDto> getFeeAttrDtos() {
+ return feeAttrDtos;
+ }
+
+ public void setFeeAttrDtos(List<FeeAttrDto> feeAttrDtos) {
+ this.feeAttrDtos = feeAttrDtos;
+ }
+
+ public String getIncomeObjName() {
+ return incomeObjName;
+ }
+
+ public void setIncomeObjName(String incomeObjName) {
+ this.incomeObjName = incomeObjName;
+ }
+
+ public String getBuiltUpArea() {
+ return builtUpArea;
+ }
+
+ public void setBuiltUpArea(String builtUpArea) {
+ this.builtUpArea = builtUpArea;
+ }
+
+ public String getVal() {
+ return val;
+ }
+
+ public void setVal(String value) {
+ this.val = value;
+ }
+
+ public String getReceivedAmountSwitch() {
+ return receivedAmountSwitch;
+ }
+
+ public void setReceivedAmountSwitch(String receivedAmountSwitch) {
+ this.receivedAmountSwitch = receivedAmountSwitch;
+ }
+
+ public String getOwnerId() {
+ return ownerId;
+ }
+
+ public void setOwnerId(String ownerId) {
+ this.ownerId = ownerId;
+ }
+
+ public Date getNowDate() {
+ return nowDate;
+ }
+
+ public void setNowDate(Date nowDate) {
+ this.nowDate = nowDate;
+ }
+
+ public int getCount() {
+ return count;
+ }
+
+ public void setCount(int count) {
+ this.count = count;
+ }
+
+ public String getComputingFormulaText() {
+ return computingFormulaText;
+ }
+
+ public void setComputingFormulaText(String computingFormulaText) {
+ this.computingFormulaText = computingFormulaText;
+ }
+
+ public String getMwPrice() {
+ return mwPrice;
+ }
+
+ public void setMwPrice(String mwPrice) {
+ this.mwPrice = mwPrice;
+ }
+
+ public String getCarTypeCd() {
+ return carTypeCd;
+ }
+
+ public void setCarTypeCd(String carTypeCd) {
+ this.carTypeCd = carTypeCd;
+ }
+
+ public String getCycle() {
+ return cycle;
+ }
+
+ public void setCycle(String cycle) {
+ this.cycle = cycle;
+ }
+
+ public double getFeeTotalPrice() {
+ return feeTotalPrice;
+ }
+
+ public void setFeeTotalPrice(double feeTotalPrice) {
+ this.feeTotalPrice = feeTotalPrice;
+ }
}
--
Gitblit v1.8.0