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); 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 = "解释说明") 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; /** 上传标志 */
