From fb7e6573c081c49439f6039f27c7af815af08474 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 08 五月 2023 15:02:55 +0800
Subject: [PATCH] 代码修改
---
ruoyi-project/src/main/java/com/ruoyi/project/domain/Reimbursementpayee.java | 5 +++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java | 3 +++
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementpayee.java | 9 ++++++++-
3 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java
index 21d267d..1b6811a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java
@@ -68,6 +68,7 @@
reimbursementpayee.setId(list.get(i).getId());
reimbursementpayee.setRbid(list.get(i).getRbid());
reimbursementpayee.setCol_bank(list.get(i).getBankname());
+ reimbursementpayee.setCol_money(list.get(i).getAmount());
reimbursementpayees.add(reimbursementpayee);
}
return getDataTable(reimbursementpayees);
@@ -115,6 +116,7 @@
payee.setPaiddate(reimbursementPayee.getCol_date());
payee.setRemark(reimbursementPayee.getCol_illustrate());
payee.setId(reimbursementPayee.getId());
+ payee.setAmount(reimbursementPayee.getCol_money());
//灏佽鏀粯鍒嗕韩鏁版嵁
ServiceReimbursementpayeeShared payeeShared = new ServiceReimbursementpayeeShared();
payeeShared.setRbid(reimbursementPayee.getRbid());
@@ -125,6 +127,7 @@
payeeShared.setPaiddate(reimbursementPayee.getCol_date());
payeeShared.setRemark(reimbursementPayee.getCol_illustrate());
payeeShared.setId(reimbursementPayee.getId());
+ payeeShared.setAmount(reimbursementPayee.getCol_money());
payees.add(payee);
payeeSareds.add(payeeShared);
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/Reimbursementpayee.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/Reimbursementpayee.java
index bd167a0..4e64914 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/Reimbursementpayee.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/Reimbursementpayee.java
@@ -60,6 +60,11 @@
@Excel(name = "鍗″彿")
private String col_accounts;
+ /** 鍗″彿 */
+ @ApiModelProperty("鎵撴閲戦")
+ @Excel(name = "鎵撴閲戦")
+ private BigDecimal col_money;
+
/** 瑙ｉ噴璇存槑 */
@ApiModelProperty("瑙ｉ噴璇存槑")
@Excel(name = "瑙ｉ噴璇存槑")
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementpayee.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementpayee.java
index bce1b08..067f8bc 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementpayee.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceReimbursementpayee.java
@@ -2,6 +2,9 @@
import java.math.BigDecimal;
import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -69,6 +72,10 @@
@Excel(name = "鑱旂郴鐢佃瘽")
private String phone;
+ /** 澶囨敞 */
+ @ApiModelProperty("澶囨敞")
+ private String remark;
+
/** 涓庢崘璧犺�呭叧绯� 鏍规嵁瀛楀吀sys_FamilyRelation */
@ApiModelProperty("涓庢崘璧犺�呭叧绯� 鏍规嵁瀛楀吀sys_FamilyRelation")
@Excel(name = "涓庢崘璧犺�呭叧绯� 鏍规嵁瀛楀吀sys_FamilyRelation")
@@ -76,8 +83,8 @@
/** 浠樻鏃ユ湡 */
@ApiModelProperty("浠樻鏃ユ湡")
+ @TableField(fill = FieldFill.DEFAULT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @Excel(name = "浠樻鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date paiddate;
/** 涓婁紶鏍囧織 */
--
Gitblit v1.9.3