java110 лет назад: 6
Родитель
Сommit
db1288fc50

+ 22 - 3
java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java

@@ -45,6 +45,10 @@ public class FeeDto extends PageDto implements Serializable {
     private String computingFormula;
     private String isDefault;
 
+    private String paymentCd;
+
+    private String paymentCycle;
+
 
     private Date createTime;
 
@@ -53,12 +57,11 @@ public class FeeDto extends PageDto implements Serializable {
     /**
      * 费用项开始时间
      */
-    private  Date configStartTime;
+    private Date configStartTime;
     /**
      * 费用项结束时间
      */
-    private Date  configEndTime;
-
+    private Date configEndTime;
 
 
     public String getAmount() {
@@ -302,4 +305,20 @@ public class FeeDto extends PageDto implements Serializable {
     public void setConfigEndTime(Date configEndTime) {
         this.configEndTime = configEndTime;
     }
+
+    public String getPaymentCd() {
+        return paymentCd;
+    }
+
+    public void setPaymentCd(String paymentCd) {
+        this.paymentCd = paymentCd;
+    }
+
+    public String getPaymentCycle() {
+        return paymentCycle;
+    }
+
+    public void setPaymentCycle(String paymentCycle) {
+        this.paymentCycle = paymentCycle;
+    }
 }

+ 19 - 0
java110-bean/src/main/java/com/java110/vo/api/fee/ApiFeeDataVo.java

@@ -33,6 +33,9 @@ public class ApiFeeDataVo implements Serializable {
     private String feePrice;
     private String isDefault;
 
+    private String paymentCd;
+
+    private String paymentCycle;
     public String getAmount() {
         return amount;
     }
@@ -176,4 +179,20 @@ public class ApiFeeDataVo implements Serializable {
     public void setIsDefault(String isDefault) {
         this.isDefault = isDefault;
     }
+
+    public String getPaymentCd() {
+        return paymentCd;
+    }
+
+    public void setPaymentCd(String paymentCd) {
+        this.paymentCd = paymentCd;
+    }
+
+    public String getPaymentCycle() {
+        return paymentCycle;
+    }
+
+    public void setPaymentCycle(String paymentCycle) {
+        this.paymentCycle = paymentCycle;
+    }
 }

+ 1 - 1
java110-db/src/main/resources/mapper/fee/FeeServiceDaoImplMapper.xml

@@ -139,7 +139,7 @@
         pfc.fee_name feeName,td1.name feeTypeCdName,td2.name stateName,td3.name feeFlagName,pfc.computing_formula
         computingFormula,
         t.payer_obj_type,t.payer_obj_type payerObjType,pfc.is_default isDefault,pfc.start_time
-        configStartTime,pfc.end_time configEndTime
+        configStartTime,pfc.end_time configEndTime,pfc.payment_cd paymentCd,pfc.payment_cycle paymentCycle
         from pay_fee t,pay_fee_config pfc,t_dict td1,t_dict td2,t_dict td3
         where 1 =1
         and t.fee_type_cd = pfc.fee_type_cd