From fa3737fbe1a83ccf9e8ad8c6c8e81483f987ab5b Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 08 十一月 2023 13:51:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/entity/ReimburseOnlineDetl.java | 68 +++++++++++++++++++++++----------
src/main/webapp/static/js/reimburseOnline/reimburseOnline.js | 12 +++---
src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java | 8 ++--
3 files changed, 57 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java b/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
index 80b0e9e..60b6511 100644
--- a/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
+++ b/src/main/java/com/zy/crm/manager/controller/ReimburseOnlineController.java
@@ -188,16 +188,16 @@
}
ProcessPermissions processPermissions3 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 3).eq("process", param.getCheckData().equals("鍚�")? "3-1" : "3-2"));//3锛氭姤閿�娴佺▼
- User president3 = userService.selectById(processPermissions3.getUserId()); // 鑾峰彇鎶ヤ环娴佺▼鑺傜偣3纭浜�
+ User president3 = userService.selectById(processPermissions3.getUserId()); // 鑾峰彇娴佺▼鑺傜偣3纭浜�
ProcessPermissions processPermissions4 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 3).eq("process", "4-1"));//3锛氭姤閿�娴佺▼
- User president4 = userService.selectById(processPermissions4.getUserId()); // 鑾峰彇鎶ヤ环娴佺▼鑺傜偣4纭浜�
+ User president4 = userService.selectById(processPermissions4.getUserId()); // 鑾峰彇娴佺▼鑺傜偣4纭浜�
ProcessPermissions processPermissions5 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 3).eq("process", "5-1"));//3锛氭姤閿�娴佺▼
- User president5 = userService.selectById(processPermissions5.getUserId()); // 鑾峰彇鎶ヤ环娴佺▼鑺傜偣5纭浜�
+ User president5 = userService.selectById(processPermissions5.getUserId()); // 鑾峰彇娴佺▼鑺傜偣5纭浜�
ProcessPermissions processPermissions6 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 3).eq("process", "6-1"));//3锛氭姤閿�娴佺▼
- User president6 = userService.selectById(processPermissions6.getUserId()); // 鑾峰彇鎶ヤ环娴佺▼鑺傜偣6纭浜�
+ User president6 = userService.selectById(processPermissions6.getUserId()); // 鑾峰彇娴佺▼鑺傜偣6纭浜�
reimburseOnline.setSettleMsg(JSON.toJSONString(SettleDto.initPriQuote(reimburseOnline, manager,president3,president4,president5,president6,getUser())));
reimburseOnline.setMemberId(manager.getId());
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
diff --git a/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js b/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
index 8ce8423..b0f1f28 100644
--- a/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
+++ b/src/main/webapp/static/js/reimburseOnline/reimburseOnline.js
@@ -330,18 +330,18 @@
{field: 'occupation', title: '浜嬬敱', width: 200},
// {field: 'expenseType', title: '璐圭敤绫诲瀷', width: 100},
{field: 'expenseType$', title: '璐圭敤绫诲瀷', width: 100},
- {field: 'taxRate', title: '绋庣巼', width: 60},
+ {field: 'taxRate$', title: '绋庣巼', width: 60},
{field: 'untaxedAmountInLocalCurrency', title: '鏈◣鏈竵閲戦', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
{field: 'untaxedAmount', title: '鏈◣閲戦', width: 100},
{field: 'taxAmount', title: '绋庨', width: 60},
{field: 'invoiceValue', title: '鍙戠エ閲戦', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
{field: 'invoiceAmountInLocalCurrency', title: '鍙戠エ鏈竵閲戦', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
- {field: 'reimbursementRatio', title: '鎶ラ攢姣斾緥', width: 100},
+ {field: 'reimbursementRatio$', title: '鎶ラ攢姣斾緥', width: 100},
{field: 'reimbursementAmount', title: '鎶ラ攢閲戦', width: 100},
{field: 'reimbursementAmountInLocalCurrency', title: '鎶ラ攢鏈竵閲戦', width: 120},
{field: 'cashierConfirmationAmount', title: '鍑虹撼纭閲戦', width: 120},
- {field: 'cashierCurrency', title: '鍑虹撼甯佺', width: 100},
- {field: 'departureTime', title: '鍑哄彂鏃ユ湡', width: 100},
+ // {field: 'cashierCurrency', title: '鍑虹撼甯佺', width: 100},
+ // {field: 'departureTime', title: '鍑哄彂鏃ユ湡', width: 100},
{field: 'cashierConfirmationAmount', title: '鍑虹撼纭閲戦', width: 120},
{field: 'userId', title: '鍒楁敮浜哄憳', width: 120},
{field: 'deptId', title: '鍒楁敮閮ㄩ棬', width: 120},
@@ -467,8 +467,8 @@
{field: 'reimbursementAmount', title: '鎶ラ攢閲戦', width: 100, edit: true},
{field: 'reimbursementAmountInLocalCurrency', title: '鎶ラ攢鏈竵閲戦', width: 120, edit: true},
{field: 'cashierConfirmationAmount', title: '鍑虹撼纭閲戦', width: 120, edit: true},
- {field: 'cashierCurrency', title: '鍑虹撼甯佺', width: 100, edit: true},
- {field: 'departureTime', title: '鍑哄彂鏃ユ湡', width: 100},
+ // {field: 'cashierCurrency', title: '鍑虹撼甯佺', width: 100, edit: true},
+ // {field: 'departureTime', title: '鍑哄彂鏃ユ湡', width: 100},
{field: 'cashierConfirmationAmount', title: '鍑虹撼纭閲戦', width: 120, edit: true},
{field: 'userId', title: '鍒楁敮浜哄憳', width: 120},
{field: 'deptId', title: '鍒楁敮閮ㄩ棬', width: 120},
--
Gitblit v1.9.1