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/device/pojo/MaintenanceTask.java |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java b/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java
index 512ce58..0c1ff1e 100644
--- a/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java
+++ b/src/main/java/com/ruoyi/device/pojo/MaintenanceTask.java
@@ -56,7 +56,7 @@
     private LocalDateTime lastExecutionTime;
 
     @ApiModelProperty(value = "鏄惁婵�娲�")
-    private boolean isActive;
+    private Integer isActive;
 
     @ApiModelProperty(value = "澶囨敞")
     @Excel(name = "澶囨敞")
@@ -68,6 +68,21 @@
     @ApiModelProperty(value = "褰曞叆浜�")
     @Excel(name = "褰曞叆浜�")
     private String registrant;
+
+    @ApiModelProperty(value = "淇濆吇浜篿d")
+    private Long maintenancePersonId;
+
+    @ApiModelProperty(value = "淇濆吇浜�")
+    @Excel(name = "淇濆吇浜�")
+    private String maintenancePerson;
+
+    @ApiModelProperty(value = "淇濆吇椤圭洰")
+    @Excel(name = "淇濆吇椤圭洰")
+    private String maintenanceItems;
+
+    @ApiModelProperty(value = "淇濆吇閮ㄤ綅")
+    @Excel(name = "淇濆吇鍐呭")
+    private String maintenanceLocation;
 
     @ApiModelProperty(value = "褰曞叆鏃ユ湡")
     @Excel(name = "褰曞叆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@@ -105,8 +120,5 @@
     @ApiModelProperty(value = "绉熸埛ID")
     @TableField(fill = com.baomidou.mybatisplus.annotation.FieldFill.INSERT)
     private Long tenantId;
-
-    @ApiModelProperty("璁惧淇濆吇浣嶇疆")
-    private String maintenanceLocation;
 
 }

--
Gitblit v1.9.3