From a8e4132c3e2e9c3b3fcb0360901b35571b6464ea Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期五, 28 八月 2026 10:13:01 +0800
Subject: [PATCH] feat: 综合业务模块功能补充与实体拓展
---
src/main/java/com/ruoyi/sales/pojo/SalesLedger.java | 70 +++++++++++++++++++++++-----------
1 files changed, 47 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
index bc4d02c..8472ca4 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -1,15 +1,16 @@
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.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Date;
+import java.util.List;
/**
* 閿�鍞彴璐﹀璞� sales_ledger
@@ -50,7 +51,7 @@
/**
* 褰曞叆鏃ユ湡
*/
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "褰曞叆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date entryDate;
@@ -103,29 +104,14 @@
@Excel(name = "鍚堝悓閲戦")
private BigDecimal contractAmount;
- @TableField(exist = false)
- @Schema(description = "鏈紑绁ㄩ噾棰�(鍏�)")
- @Excel(name = "鏈紑绁ㄩ噾棰�")
- private BigDecimal noInvoiceAmountTotal = BigDecimal.ZERO;
-
@Schema(description = "绛捐鏃ユ湡")
private LocalDate executionDate;
- @TableField(exist = false)
- @Schema(description = "宸插紑绁ㄩ噾棰�(鍏�)")
- @Excel(name = "宸插紑绁ㄩ噾棰�")
- private BigDecimal invoiceTotal = BigDecimal.ZERO;
-
- @TableField(exist = false)
- @Schema(description = "鍥炴閲戦")
- private BigDecimal receiptPaymentAmountTotal = BigDecimal.ZERO;
-
- @TableField(exist = false)
- @Schema(description = "寰呭洖娆鹃噾棰�")
- private BigDecimal noReceiptAmount = BigDecimal.ZERO;
-
@Schema(description = "浠樻鏂瑰紡")
private String paymentMethod;
+
+ @Schema(description = "瀹為檯鍚堝悓閲戦")
+ private BigDecimal netContractAmount;
@TableField(exist = false)
@Schema(description = "鐢熶骇鐘舵��")
@@ -158,5 +144,43 @@
@TableField(exist = false)
private Boolean hasProductionRecord;
+ @Schema(description = "椤圭洰ID")
+ private Long projectId;
+
+ @Schema(description = "骞翠唤")
+ @Excel(name = "骞翠唤")
+ private Integer year;
+
+ @Schema(description = "绛惧崟鍗曚綅ID")
+ private Long signingUnitId;
+
+ @Schema(description = "鍔炰簨澶処D")
+ private Long officeId;
+
+ @Schema(description = "缁勮礋璐ｄ汉ID")
+ private Long groupLeaderId;
+
+ @Schema(description = "鏄惁寮�鍙戠エ(1鏄� 0鍚�)")
+ private Integer isInvoice;
+
+ @Schema(description = "涓爣浠�")
+ @Excel(name = "涓爣浠�")
+ private BigDecimal bidPrice;
+
+ @Schema(description = "鏄惁涓爣(1鏄� 0鍚�)")
+ private Integer isBid;
+
+ @Schema(description = "鏈腑鏍囧師鍥�")
+ private String unbidReason;
+
+ @Schema(description = "鍚堝悓鍘熶欢绾﹀畾鍥炰紶鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @Excel(name = "鍚堝悓鍘熶欢绾﹀畾鍥炰紶鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate contractOriginalReturnDate;
+
+ @TableField(exist = false)
+ @Schema(description = "鍏宠仈鍚堝悓ID鍒楄〃")
+ private List<Long> associatedContractIds;
}
--
Gitblit v1.9.3