From 1fcaf7919db7ec3350e9bf953c0d651d4d85fac2 Mon Sep 17 00:00:00 2001 From: liyong <18434998025@163.com> Date: 星期一, 23 六月 2025 11:45:48 +0800 Subject: [PATCH] 2025-06-23 回款登记导出+分页查询条件问题修复+【采购管理】-【来票登记】,合同金额列后面增加已开票金额、待开票金额两列 --- src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java index 49fda54..aeea446 100644 --- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java +++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java @@ -1,4 +1,37 @@ package com.ruoyi.sales.dto; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.sales.pojo.CommonFile; +import com.ruoyi.sales.pojo.SalesLedgerProduct; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDate; +import java.util.Date; +import java.util.List; + +@Data public class SalesLedgerDto { + private Long id; + private String salesContractNo; + private String customerContractNo; + private String projectName; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date entryDate; + private String salesman; + private Long customerId; + private String customerName; + private String entryPerson; + private String remarks; + private String attachmentMaterials; + private Boolean hasChildren = false; + private List<SalesLedgerProduct> productData; + private List<String> tempFileIds; + private List<CommonFile> SalesLedgerFiles; + + private Integer Type; + @ApiModelProperty(value = "绛捐鏃ユ湡") + private LocalDate executionDate; + + private Boolean status; } -- Gitblit v1.9.3