From 256f758a45c9b00a9248b02345ee1d6f52869e08 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 05 十一月 2025 09:36:58 +0800
Subject: [PATCH] yys 1.导出接口开发 2.营销管理-回款登记-回款状态(回款完成,未完成) 3.采购管理-付款登记-加一个付款进度 4.采购管理-付款流水-采购合同号筛选 5.仓储物流-所有-查询条件加一个日期 6.仓储物流-入库管理-加一个库存预警数量字段 7.生产管控-生产订单-加一个订单状态-已完成、未完成 8.协同办公-通知公告-加一个时间限制,过时后状态改为已过期

---
 src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
index cc9b935..5bbf31f 100644
--- a/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
@@ -1,13 +1,16 @@
 package com.ruoyi.sales.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.sales.pojo.ReceiptPayment;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.util.Date;
 
 @Data
 public class ReceiptPaymentDto extends ReceiptPayment {
@@ -16,10 +19,26 @@
     @Excel(name = "瀹㈡埛鍚堝悓鍙�")
     private String customerContractNo;
 
+    @ApiModelProperty(value = "鐘舵��")
+    @Excel(name = "鐘舵��")
+    private String statusName;
+
+
     @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
     @Excel(name = "瀹㈡埛鍚嶇О")
     private String customerName;
 
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "寮�绁ㄦ棩鏈�",width = 30,dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty(value = "寮�绁ㄦ棩鏈�")
+    private Date invoiceDate;
+
+    @TableField(exist = false)
+    private String invoiceDateStart;
+    @TableField(exist = false)
+    private String invoiceDateEnd;
+
     @ApiModelProperty(value = "鏌ヨ鏂囨湰")
     private String searchText;
 

--
Gitblit v1.9.3