From 7b6741f6ccf11d0043ad94914d41a9bd23452d00 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 29 五月 2026 15:13:24 +0800
Subject: [PATCH] feat(sales): 添加销售台账审核反审功能 1.在销售台账下新增子级菜单:未审批订单和反审核数据。分别进行订单审 核和查看反审核的历史数据。 2.在销售台账页面，新增一个编辑按钮，可以对已审核的订单进行单价修 改。 3.新增反审核按钮，对已审核的订单进行反审核，反审核之后会保存当前订 单的数据快照，便于在反审核菜单进行查看。反审核的订单重新生成一条销 售订单数据进行编辑。
---
src/main/java/com/ruoyi/staff/dto/SaveStaffSchedulingDto.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/dto/SaveStaffSchedulingDto.java b/src/main/java/com/ruoyi/staff/dto/SaveStaffSchedulingDto.java
index 25a41b3..7e57745 100644
--- a/src/main/java/com/ruoyi/staff/dto/SaveStaffSchedulingDto.java
+++ b/src/main/java/com/ruoyi/staff/dto/SaveStaffSchedulingDto.java
@@ -1,5 +1,6 @@
package com.ruoyi.staff.dto;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -21,27 +22,34 @@
public class SaveStaffSchedulingDto implements Serializable {
private Integer id;
- @NotNull(message = "蹇呴』瑕侀�夋嫨鍛樺伐")
- private Integer staffId;
+// @NotNull(message = "蹇呴』瑕侀�夋嫨鍛樺伐")
+ private String staffId;
- @NotNull(message = "閮ㄩ棬id涓嶈兘涓虹┖!")
+ /**
+ * 鍗堜紤鏃堕棿
+ */
+ private String lunchTime;
+
+ private String staffName;
+
+// @NotNull(message = "閮ㄩ棬id涓嶈兘涓虹┖!")
private Integer department;
- @NotNull(message = "鐝id涓嶈兘涓虹┖!")
+// @NotNull(message = "鐝id涓嶈兘涓虹┖!")
private Integer shiftType;
- @NotNull(message = "宸ヤ綔鏃ヤ笉鑳戒负绌�!")
+// @NotNull(message = "宸ヤ綔鏃ヤ笉鑳戒负绌�!")
private Date workDate;
- @NotNull(message = "涓婄彮鏃堕棿涓嶈兘涓虹┖!")
+// @NotNull(message = "涓婄彮鏃堕棿涓嶈兘涓虹┖!")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime workStartTime;
- @NotNull(message = "涓嬬彮鏃堕棿涓嶈兘涓虹┖!")
+// @NotNull(message = "涓嬬彮鏃堕棿涓嶈兘涓虹┖!")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime workEndTime;
- @NotNull(message = "宸ユ椂涓嶈兘涓虹┖!")
+// @NotNull(message = "宸ユ椂涓嶈兘涓虹┖!")
private Integer status;
private String remark;
--
Gitblit v1.9.3