From e399a8db7dd73361534da5ae33076757b6f7a715 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 04 三月 2021 13:26:04 +0800
Subject: [PATCH] 优化水电抄表功能

---
 java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java |   83 +++++++++++++++++++++++++++++++++++++++++
 1 files changed, 82 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
index f6de4c3..cce04bb 100644
--- a/java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java
@@ -25,10 +25,12 @@
     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;
     private String incomeObjId;
+    private String incomeObjName;
     private String feeTypeCd;
     private Date startTime;
     private Date endTime;
@@ -40,6 +42,12 @@
     private String[] payerObjIds;
     private String[] feeTypeCds;
     private String configId;
+
+    //鏄犲皠鍏崇郴寮�鍏冲��
+    private String val;
+
+    //瀹炴敹閲戦鏄犲皠寮�鍏冲��
+    private String receivedAmountSwitch;
 
     private String squarePrice;
     private String additionalAmount;
@@ -56,10 +64,12 @@
     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;
 
@@ -75,6 +85,8 @@
     private String ownerName;
 
     private String ownerTel;
+
+    private String ownerId;
 
 
     private Date createTime;
@@ -103,6 +115,12 @@
     private Date curReadingTime;
 
     private List<FeeAttrDto> feeAttrDtos;
+
+    //褰撳墠鏃堕棿
+    private Date nowDate;
+
+    //鏌ヨ鍑虹殑鏁伴噺
+    private int count;
 
 
     public String getAmount() {
@@ -193,7 +211,6 @@
     public void setEndTime(Date endTime) {
         this.endTime = endTime;
     }
-
 
     public Date getArrearsEndTime() {
         return arrearsEndTime;
@@ -498,4 +515,68 @@
     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;
+    }
 }

--
Gitblit v1.8.0