From dd69bfc1fb8e5e28dde754fab7f23bfb1a18faa5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 05 六月 2026 16:58:07 +0800
Subject: [PATCH] config(dev): 更新开发环境配置和文件上传功能 - 调整文件上传路径配置 - 修复OA环境文件链接前缀配置 - 在审批实例服务中添加报销相关数据删除逻辑 - 实现申请人姓名自动填充功能 - 添加文件下载预览路由的正则表达式支持 - 为企业新闻VO添加附件列表兼容别名 - 完善员工入职服务的异常处理 - 新增账户附件管理控制器 - 实现文件上传接口并返回完整文件信息
---
src/main/java/com/ruoyi/sales/pojo/SalesLedger.java | 51 ++++++++++++++++++++++-----------------------------
1 files changed, 22 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
index 36751c2..00736ba 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -1,15 +1,15 @@
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 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;
/**
* 閿�鍞彴璐﹀璞� sales_ledger
@@ -78,7 +78,7 @@
private String entryPerson;
@TableField(exist = false)
- @ApiModelProperty(value = "褰曞叆浜�")
+ @Schema(description = "褰曞叆浜�")
@Excel(name = "褰曞叆浜�")
private String entryPersonName;
@@ -103,41 +103,23 @@
@Excel(name = "鍚堝悓閲戦")
private BigDecimal contractAmount;
- @TableField(exist = false)
- @ApiModelProperty(value = "鏈紑绁ㄩ噾棰�(鍏�)")
- @Excel(name = "鏈紑绁ㄩ噾棰�")
- private BigDecimal noInvoiceAmountTotal = BigDecimal.ZERO;
-
- @ApiModelProperty(value = "绛捐鏃ユ湡")
+ @Schema(description = "绛捐鏃ユ湡")
private LocalDate executionDate;
- @TableField(exist = false)
- @ApiModelProperty(value = "宸插紑绁ㄩ噾棰�(鍏�)")
- @Excel(name = "宸插紑绁ㄩ噾棰�")
- private BigDecimal invoiceTotal = BigDecimal.ZERO;
-
- @TableField(exist = false)
- @ApiModelProperty(value = "鍥炴閲戦")
- private BigDecimal receiptPaymentAmountTotal = BigDecimal.ZERO;
-
- @TableField(exist = false)
- @ApiModelProperty(value = "寰呭洖娆鹃噾棰�")
- private BigDecimal noReceiptAmount = BigDecimal.ZERO;
-
- @ApiModelProperty(value = "浠樻鏂瑰紡")
+ @Schema(description = "浠樻鏂瑰紡")
private String paymentMethod;
@TableField(exist = false)
- @ApiModelProperty(value = "鐢熶骇鐘舵��")
+ @Schema(description = "鐢熶骇鐘舵��")
private String productionStatus = "鏈紑濮�";
//浜よ揣鏃ユ湡
- @ApiModelProperty(value = "浜よ揣鏃ユ湡")
+ @Schema(description = "浜よ揣鏃ユ湡")
@TableField(value = "delivery_date")
private LocalDate deliveryDate;
@TableField(exist = false)
- @ApiModelProperty(value = "浜よ揣澶╂暟宸�")
+ @Schema(description = "浜よ揣澶╂暟宸�")
private Integer deliveryDaysDiff;
@TableField(exist = false)
@@ -147,5 +129,16 @@
@TableField(exist = false)
//鏄惁鍙紪杈�
private Boolean isEdit;
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
+ @Schema(description = "鏄惁鏈夌敓浜ц褰�")
+ @TableField(exist = false)
+ private Boolean hasProductionRecord;
+
}
--
Gitblit v1.9.3