From 8b109f923dc7c2d5c5bd351a03a5277670962aac Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 04 十二月 2023 13:05:04 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/crm/manager/entity/ReimburseOnlineDetl.java |   68 +++++++++++++++++++++++----------
 1 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/zy/crm/manager/entity/ReimburseOnlineDetl.java b/src/main/java/com/zy/crm/manager/entity/ReimburseOnlineDetl.java
index e73a8f9..3ddc816 100644
--- a/src/main/java/com/zy/crm/manager/entity/ReimburseOnlineDetl.java
+++ b/src/main/java/com/zy/crm/manager/entity/ReimburseOnlineDetl.java
@@ -68,70 +68,70 @@
      */
     @ApiModelProperty(value= "绋庣巼")
     @TableField("tax_rate")
-    private Long taxRate;
+    private Double taxRate;
 
     /**
      * 鏈◣鏈竵閲戦
      */
     @ApiModelProperty(value= "鏈◣鏈竵閲戦")
     @TableField("untaxed_amount_in_local_currency")
-    private Long untaxedAmountInLocalCurrency;
+    private Double untaxedAmountInLocalCurrency;
 
     /**
      * 鏈◣閲戦
      */
     @ApiModelProperty(value= "鏈◣閲戦")
     @TableField("untaxed_amount")
-    private Long untaxedAmount;
+    private Double untaxedAmount;
 
     /**
      * 绋庨
      */
     @ApiModelProperty(value= "绋庨")
     @TableField("tax_amount")
-    private Long taxAmount;
+    private Double taxAmount;
 
     /**
      * 鍙戠エ閲戦
      */
     @ApiModelProperty(value= "鍙戠エ閲戦")
     @TableField("invoice_value")
-    private Long invoiceValue;
+    private Double invoiceValue;
 
     /**
      * 鍙戠エ鏈竵閲戦
      */
     @ApiModelProperty(value= "鍙戠エ鏈竵閲戦")
     @TableField("invoice_amount_in_local_currency")
-    private Long invoiceAmountInLocalCurrency;
+    private Double invoiceAmountInLocalCurrency;
 
     /**
      * 鎶ラ攢姣斾緥
      */
     @ApiModelProperty(value= "鎶ラ攢姣斾緥")
     @TableField("reimbursement_ratio")
-    private Long reimbursementRatio;
+    private Double reimbursementRatio;
 
     /**
      * 鎶ラ攢閲戦
      */
     @ApiModelProperty(value= "鎶ラ攢閲戦")
     @TableField("reimbursement_amount")
-    private Long reimbursementAmount;
+    private Double reimbursementAmount;
 
     /**
      * 鎶ラ攢鏈竵閲戦
      */
     @ApiModelProperty(value= "鎶ラ攢鏈竵閲戦")
     @TableField("reimbursement_amount_in_local_currency")
-    private Long reimbursementAmountInLocalCurrency;
+    private Double reimbursementAmountInLocalCurrency;
 
     /**
      * 鍑虹撼纭閲戦
      */
     @ApiModelProperty(value= "鍑虹撼纭閲戦")
     @TableField("cashier_confirmation_amount")
-    private Long cashierConfirmationAmount;
+    private Double cashierConfirmationAmount;
 
     /**
      * 鍑虹撼甯佺
@@ -201,7 +201,7 @@
 
     public ReimburseOnlineDetl() {}
 
-    public ReimburseOnlineDetl(String occupation,Integer expenseType,Integer userId,Integer deptId,Integer hostId,Long orderId,Long taxRate,Long untaxedAmountInLocalCurrency,Long untaxedAmount,Long taxAmount,Long invoiceValue,Long invoiceAmountInLocalCurrency,Long reimbursementRatio,Long reimbursementAmount,Long reimbursementAmountInLocalCurrency,Long cashierConfirmationAmount,Integer cashierCurrency,Date departureTime,Date updateTime,Integer updateUserId,String updateUserName,Date creationTime,Integer creationUserId,String creationUserName,Integer reimburseId) {
+    public ReimburseOnlineDetl(String occupation,Integer expenseType,Integer userId,Integer deptId,Integer hostId,Long orderId,Double taxRate,Double untaxedAmountInLocalCurrency,Double untaxedAmount,Double taxAmount,Double invoiceValue,Double invoiceAmountInLocalCurrency,Double reimbursementRatio,Double reimbursementAmount,Double reimbursementAmountInLocalCurrency,Double cashierConfirmationAmount,Integer cashierCurrency,Date departureTime,Date updateTime,Integer updateUserId,String updateUserName,Date creationTime,Integer creationUserId,String creationUserName,Integer reimburseId) {
         this.occupation = occupation;
         this.expenseType = expenseType;
         this.userId = userId;
@@ -231,16 +231,16 @@
     public ReimburseOnlineDetl(Integer reminburseCostTypeId) {
         this.occupation = "";
         this.expenseType = reminburseCostTypeId;
-        this.taxRate = (long)0.0;
-        this.untaxedAmountInLocalCurrency = (long)0.0;
-        this.untaxedAmount = (long)0.0;
-        this.taxAmount = (long)0.0;
-        this.invoiceValue = (long)0.0;
-        this.invoiceAmountInLocalCurrency = (long)0.0;
-        this.reimbursementRatio = (long)0.0;
-        this.reimbursementAmount = (long)0.0;
-        this.reimbursementAmountInLocalCurrency = (long)0.0;
-        this.cashierConfirmationAmount = (long)0.0;
+        this.taxRate = 0.0;
+        this.untaxedAmountInLocalCurrency = 0.0;
+        this.untaxedAmount = 0.0;
+        this.taxAmount = 0.0;
+        this.invoiceValue = 0.0;
+        this.invoiceAmountInLocalCurrency = 0.0;
+        this.reimbursementRatio = 0.0;
+        this.reimbursementAmount = 0.0;
+        this.reimbursementAmountInLocalCurrency = 0.0;
+        this.cashierConfirmationAmount = 0.0;
     }
 
 
@@ -274,4 +274,30 @@
         return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.creationTime);
     }
 
+    public void setTaxRate(String taxRate){
+        String[] splitTaxRate = taxRate.split("%");
+        this.taxRate=Double.parseDouble(splitTaxRate[0]);
+    }
+
+    public void setTaxRate(Double taxRate){
+        this.taxRate=taxRate;
+    }
+
+    public String getTaxRate$(){
+        return taxRate.toString()+"%";
+    }
+
+    public void setReimbursementRatio(String reimbursementRatio){
+        String[] splitReimbursementRatio = reimbursementRatio.split("%");
+        this.reimbursementRatio=Double.parseDouble(splitReimbursementRatio[0]);
+    }
+
+    public void setReimbursementRatio(Double reimbursementRatio){
+        this.reimbursementRatio=reimbursementRatio;
+    }
+
+    public String getReimbursementRatio$(){
+        return reimbursementRatio.toString()+"%";
+    }
+
 }
\ No newline at end of file

--
Gitblit v1.9.1