From 3c6a4c77f311b6797b927da025a29b9d9ce7888f Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期四, 13 七月 2023 00:58:27 +0800
Subject: [PATCH] 业主保存投票开发完成

---
 java110-bean/src/main/java/com/java110/dto/fee/FeeConfigDto.java |  107 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 106 insertions(+), 1 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/fee/FeeConfigDto.java b/java110-bean/src/main/java/com/java110/dto/fee/FeeConfigDto.java
old mode 100644
new mode 100755
index 4a76117..b72f642
--- a/java110-bean/src/main/java/com/java110/dto/fee/FeeConfigDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/fee/FeeConfigDto.java
@@ -22,23 +22,38 @@
     public static final String BILL_TYPE_ONCE_MONTH = "005";// 涓�娆℃�ф寜鏈�
 
     public static final String DEFAULT_FEE_CONFIG = "T";
+    public static final String CUSTOME_FEE_CONFIG = "F";
 
     public static final String FEE_TYPE_CD_WATER = "888800010016";//鐢佃垂
     public static final String FEE_TYPE_CD_METER = "888800010015";//姘磋垂
+    public static final String FEE_TYPE_CD_GAS = "888800010009";//鐓ゆ皵
     public static final String FEE_TYPE_CD_SYSTEM = "888800010000";//绯荤粺
-
+    public static final String FEE_TYPE_CD_PARKING = "888800010008";//绯荤粺
+    public static final String FEE_TYPE_CD_RENT = "888800010018";// 绉熼噾
     public static final String CONFIG_ID_RENTING = "920000000000000000";//绉熻祦璐圭敤椤�
+    public static final String CONFIG_ID_GOODS = "930000000000000000";//鍟嗗搧璐圭敤椤�
 
+    public static final String COMPUTING_FORMULA_TEMP_CAR = "9999";
+    public static final String COMPUTING_FORMULA_RANT_RATE = "1102"; // 绉熼噾閫掑
+    public static final String COMPUTING_FORMULA_DYNAMIC = "4004"; // 绉熼噾閫掑
+
+    public static final String PAYMENT_CD_PRE = "1200";
+    public static final String PAYMENT_CD_AFTER = "2100";
+
+    public static final String DEDUCT_FROM_N = "N";
 
 
     private String feeTypeCd;
     private String computingFormula;
+    private String computingFormulaName;
     private String additionalAmount;
     private String squarePrice;
     private String isDefault;
     private String configId;
+    private String[] configIds;
     private String feeFlag;
     private String feeName;
+    private String feeNameEq;
     private String startTime;
     private String endTime;
     private String curTime;
@@ -60,6 +75,16 @@
     private Date createTime;
 
     private String statusCd = "0";
+    private String computingFormulaText;
+
+    private String deductFrom;
+
+    private double amount;
+
+    private String payOnline;
+    private String scale;
+    private String decimalPlace;
+    private String units;
 
 
     public String getFeeTypeCd() {
@@ -231,4 +256,84 @@
     public void setValid(String valid) {
         this.valid = valid;
     }
+
+    public String getComputingFormulaText() {
+        return computingFormulaText;
+    }
+
+    public void setComputingFormulaText(String computingFormulaText) {
+        this.computingFormulaText = computingFormulaText;
+    }
+
+    public String[] getConfigIds() {
+        return configIds;
+    }
+
+    public void setConfigIds(String[] configIds) {
+        this.configIds = configIds;
+    }
+
+    public String getFeeNameEq() {
+        return feeNameEq;
+    }
+
+    public void setFeeNameEq(String feeNameEq) {
+        this.feeNameEq = feeNameEq;
+    }
+
+    public double getAmount() {
+        return amount;
+    }
+
+    public void setAmount(double amount) {
+        this.amount = amount;
+    }
+
+    public String getDeductFrom() {
+        return deductFrom;
+    }
+
+    public void setDeductFrom(String deductFrom) {
+        this.deductFrom = deductFrom;
+    }
+
+    public String getComputingFormulaName() {
+        return computingFormulaName;
+    }
+
+    public void setComputingFormulaName(String computingFormulaName) {
+        this.computingFormulaName = computingFormulaName;
+    }
+
+    public String getPayOnline() {
+        return payOnline;
+    }
+
+    public void setPayOnline(String payOnline) {
+        this.payOnline = payOnline;
+    }
+
+    public String getScale() {
+        return scale;
+    }
+
+    public void setScale(String scale) {
+        this.scale = scale;
+    }
+
+    public String getDecimalPlace() {
+        return decimalPlace;
+    }
+
+    public void setDecimalPlace(String decimalPlace) {
+        this.decimalPlace = decimalPlace;
+    }
+
+    public String getUnits() {
+        return units;
+    }
+
+    public void setUnits(String units) {
+        this.units = units;
+    }
 }

--
Gitblit v1.8.0