From e57e32fc43da31917912eebb4e47d4e50df1a9e9 Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: 星期四, 05 八月 2021 22:56:15 +0800
Subject: [PATCH] 完善格式化功能

---
 java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java |   53 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 52 insertions(+), 1 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 acd5fe5..77f0b7b
--- a/java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java
@@ -21,10 +21,12 @@
 
     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_CYCLE = "1003006";
     public static final String REDIS_PAY_OWE_FEE = "PAY_OWE_FEE_";
 
     private String amount;
@@ -49,6 +51,7 @@
     private String receivedAmountSwitch;
 
     private String squarePrice;
+    private String mwPrice;
     private String additionalAmount;
     private String state;
     private String stateName;
@@ -63,6 +66,7 @@
     private double feePrice;
     private String payerObjType;
     private String computingFormula;
+    private String computingFormulaText;
     private String isDefault;
     private double oweFee; // 娆犺垂閲戦
     private String billType;
@@ -83,6 +87,8 @@
     private String ownerName;
 
     private String ownerTel;
+
+    private String ownerId;
 
 
     private Date createTime;
@@ -111,6 +117,12 @@
     private Date curReadingTime;
 
     private List<FeeAttrDto> feeAttrDtos;
+
+    //褰撳墠鏃堕棿
+    private Date nowDate;
+
+    //鏌ヨ鍑虹殑鏁伴噺
+    private int count;
 
 
     public String getAmount() {
@@ -201,7 +213,6 @@
     public void setEndTime(Date endTime) {
         this.endTime = endTime;
     }
-
 
     public Date getArrearsEndTime() {
         return arrearsEndTime;
@@ -538,4 +549,44 @@
     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;
+    }
 }

--
Gitblit v1.8.0