From 8e39f175ef26827d08904a65b10748e736eeca21 Mon Sep 17 00:00:00 2001 From: liyong <18434998025@163.com> Date: 星期一, 23 六月 2025 10:20:08 +0800 Subject: [PATCH] 2025-06-23 【销售台账】 增加客户合同号、销售合同号、项目名称模糊查询 增加客户名称、客户合同号、项目名称查询,不显示待回款为0,默认为打钩。 销售管理】-【回款流水】,增加合同号、项目名称列查询,增加客户名称、项目名称、合同号查询条件。 【销售管理】-【回款登记】,增加导出功能 --- src/main/java/com/ruoyi/sales/pojo/SalesLedger.java | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java index 2ebf084..06b8369 100644 --- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java +++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java @@ -1,11 +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.ruoyi.framework.aspectj.lang.annotation.Excel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -70,8 +72,12 @@ /** * 褰曞叆浜� */ - @Excel(name = "褰曞叆浜�") private String entryPerson; + + @TableField(exist = false) + @ApiModelProperty(value = "褰曞叆浜�") + @Excel(name = "褰曞叆浜�") + private String entryPersonName; /** * 澶囨敞 @@ -93,5 +99,16 @@ */ @Excel(name = "鍚堝悓閲戦") private BigDecimal contractAmount; + + @TableField(exist = false) + @ApiModelProperty(value = "鏈紑绁ㄩ噾棰�(鍏�)") + private BigDecimal noInvoiceAmountTotal; + + @ApiModelProperty(value = "绛捐鏃ユ湡") + private LocalDate executionDate; + + @TableField(exist = false) + @ApiModelProperty(value = "宸插紑绁ㄩ噾棰�(鍏�)") + private BigDecimal invoiceTotal; } -- Gitblit v1.9.3