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/dto/WordDateDto.java | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/dto/WordDateDto.java b/src/main/java/com/ruoyi/dto/WordDateDto.java
index c316d2d..33af829 100644
--- a/src/main/java/com/ruoyi/dto/WordDateDto.java
+++ b/src/main/java/com/ruoyi/dto/WordDateDto.java
@@ -2,12 +2,14 @@
import com.ruoyi.staff.pojo.StaffOnJob;
import lombok.Data;
+import lombok.EqualsAndHashCode;
/**
* @author :yys
* @date : 2025/11/5 14:34
*/
@Data
+@EqualsAndHashCode(callSuper = true)
public class WordDateDto extends StaffOnJob {
// 鍚堝悓鏃ユ湡鐩稿叧
@@ -15,18 +17,34 @@
private String qmoth; // 绛捐鏃ユ湡-鏈堬紙娉ㄦ剰鍘熸枃妗ｆ嫾鍐欙細qmoth=month锛�
private String qday; // 绛捐鏃ユ湡-鏃�
- private String syear; // 鍚堝悓寮�濮嬪勾
- private String smoth; // 鍚堝悓寮�濮嬫湀
- private String sday; // 鍚堝悓寮�濮嬫棩
- private String eyear; // 鍚堝悓缁撴潫骞达紙浠匒绫诲瀷闇�瑕侊級
- private String emoth; // 鍚堝悓缁撴潫鏈堬紙浠匒绫诲瀷闇�瑕侊級
- private String eday; // 鍚堝悓缁撴潫鏃ワ紙浠匒绫诲瀷闇�瑕侊級
+ private String syear = ""; // 鍚堝悓寮�濮嬪勾
+ private String smoth = ""; // 鍚堝悓寮�濮嬫湀
+ private String sday = ""; // 鍚堝悓寮�濮嬫棩
+ private String eyear = ""; // 鍚堝悓缁撴潫骞达紙浠匒绫诲瀷闇�瑕侊級
+ private String emoth = ""; // 鍚堝悓缁撴潫鏈堬紙浠匒绫诲瀷闇�瑕侊級
+ private String eday = ""; // 鍚堝悓缁撴潫鏃ワ紙浠匒绫诲瀷闇�瑕侊級
// 璇曠敤鏈熺浉鍏�
- private String styear; // 璇曠敤鏈熷紑濮嬪勾
- private String stmoth; // 璇曠敤鏈熷紑濮嬫湀
- private String stday; // 璇曠敤鏈熷紑濮嬫棩
- private String seyear; // 璇曠敤鏈熺粨鏉熷勾
- private String semoth; // 璇曠敤鏈熺粨鏉熸湀
- private String seday; // 璇曠敤鏈熺粨鏉熸棩
+ private String styear = ""; // 璇曠敤鏈熷紑濮嬪勾
+ private String stmoth = ""; // 璇曠敤鏈熷紑濮嬫湀
+ private String stday = ""; // 璇曠敤鏈熷紑濮嬫棩
+ private String seyear = ""; // 璇曠敤鏈熺粨鏉熷勾
+ private String semoth = ""; // 璇曠敤鏈熺粨鏉熸湀
+ private String seday = ""; // 璇曠敤鏈熺粨鏉熸棩
+
+ private String bsyear = ""; // 鍚堝悓寮�濮嬪勾
+ private String bsmoth = ""; // 鍚堝悓寮�濮嬫湀
+ private String bsday = ""; // 鍚堝悓寮�濮嬫棩
+
+ // 璇曠敤鏈熺浉鍏�
+ private String bstyear = ""; // 璇曠敤鏈熷紑濮嬪勾
+ private String bstmoth = ""; // 璇曠敤鏈熷紑濮嬫湀
+ private String bstday = ""; // 璇曠敤鏈熷紑濮嬫棩
+ private String bseyear = ""; // 璇曠敤鏈熺粨鏉熷勾
+ private String bsemoth = ""; // 璇曠敤鏈熺粨鏉熸湀
+ private String bseday = ""; // 璇曠敤鏈熺粨鏉熸棩
+
+ private String csyear = ""; // 鍚堝悓寮�濮嬪勾
+ private String csmoth = ""; // 鍚堝悓寮�濮嬫湀
+ private String csday = ""; // 鍚堝悓寮�濮嬫棩
}
--
Gitblit v1.9.3