From 530b456eded06e0692e1d8bd5891069439c8f8f8 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 17 四月 2026 15:10:56 +0800
Subject: [PATCH] fix: 1.已发货的销售台账对应的出入库记录做限制不能删除;2.销售台账入库操作后，点击删除，对应的销售入库记录未一并删除；3.销售台账入库状态新增部分入库
---
src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java b/src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java
index 04f5169..0a2c0ae 100644
--- a/src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java
+++ b/src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java
@@ -2,25 +2,27 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
import com.ruoyi.staff.pojo.StaffOnJob;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@Data
public class StaffOnJobDto extends StaffOnJob {
- @Excel(name = "宀椾綅",sort = 7)
+ @Excel(name = "閮ㄩ棬",sort = 7)
+ private String deptName;
+
+ @Excel(name = "宀椾綅",sort = 8)
private String postName;
- @Excel(name = "鍚堝悓骞撮檺")
private String contractTerm;
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鍚堝悓寮�濮嬫棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date contractStartTime;
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鍚堝悓缁撴潫鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date contractEndTime;
}
--
Gitblit v1.9.3