From a95ea84bcb75d7132a3c7333c2c5252be29a3f0d Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期三, 24 九月 2025 17:46:18 +0800
Subject: [PATCH] OA系统-项目任务协同。项目,项目阶段,项目阶段任务

---
 src/main/java/com/ruoyi/sales/pojo/SalesLedger.java |   29 +++++++++++++++++++++++++++--
 1 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
index def5e39..61a4c36 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -1,6 +1,7 @@
 package com.ruoyi.sales.pojo;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.*;
@@ -8,6 +9,7 @@
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 閿�鍞彴璐﹀璞� sales_ledger
@@ -49,6 +51,7 @@
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "褰曞叆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date entryDate;
 
     /**
@@ -71,8 +74,12 @@
     /**
      * 褰曞叆浜�
      */
-    @Excel(name = "褰曞叆浜�")
     private String entryPerson;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "褰曞叆浜�")
+    @Excel(name = "褰曞叆浜�")
+    private String entryPersonName;
 
     /**
      * 澶囨敞
@@ -97,6 +104,24 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "鏈紑绁ㄩ噾棰�(鍏�)")
-    private BigDecimal noInvoiceAmountTotal;
+    private BigDecimal noInvoiceAmountTotal = BigDecimal.ZERO;
+
+    @ApiModelProperty(value = "绛捐鏃ユ湡")
+    private LocalDate executionDate;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "宸插紑绁ㄩ噾棰�(鍏�)")
+    private BigDecimal invoiceTotal = BigDecimal.ZERO;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "鍥炴閲戦")
+    private BigDecimal receiptPaymentAmountTotal = BigDecimal.ZERO;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "寰呭洖娆鹃噾棰�")
+    private BigDecimal noReceiptAmount = BigDecimal.ZERO;
+
+    @ApiModelProperty(value = "浠樻鏂瑰紡")
+    private String paymentMethod;
 }
 

--
Gitblit v1.9.3