From 5826a876f9c1a4fb08a0d937c199e7717c51282b Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 05 六月 2025 17:25:27 +0800
Subject: [PATCH] 客户往来bug修复
---
src/main/java/com/ruoyi/sales/pojo/SalesLedger.java | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
index 5f35293..8378012 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -1,12 +1,13 @@
package com.ruoyi.sales.pojo;
+import java.math.BigDecimal;
+import java.time.LocalDate;
import java.util.Date;
+import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -60,14 +61,23 @@
/**
* 瀹㈡埛鍚嶇О
*/
+ private Long customerId;
+
+ /**
+ * 瀹㈡埛鍚嶇О
+ */
@Excel(name = "瀹㈡埛鍚嶇О")
private String customerName;
/**
* 褰曞叆浜�
*/
- @Excel(name = "褰曞叆浜�")
private String entryPerson;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "褰曞叆浜�")
+ @Excel(name = "褰曞叆浜�")
+ private String entryPersonName;
/**
* 澶囨敞
@@ -78,8 +88,23 @@
/**
* 闄勪欢鏉愭枡锛屽瓨鍌ㄦ枃浠跺悕绛夌浉鍏充俊鎭�
*/
- @Excel(name = "闄勪欢鏉愭枡锛屽瓨鍌ㄦ枃浠跺悕绛夌浉鍏充俊鎭�")
private String attachmentMaterials;
+ @TableField(fill = FieldFill.INSERT)
+ private Long tenantId;
+
+
+ /**
+ * 鍚堝悓閲戦锛堜骇鍝佸惈绋庢�讳环锛�
+ */
+ @Excel(name = "鍚堝悓閲戦")
+ private BigDecimal contractAmount;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鏈紑绁ㄩ噾棰�(鍏�)")
+ private BigDecimal noInvoiceAmountTotal;
+
+ @ApiModelProperty(value = "绛捐鏃ユ湡")
+ private LocalDate executionDate;
}
--
Gitblit v1.9.3