From c8f6aea97240ba69b5154266190b106c0e82b143 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Wed, 17 Dec 2025 10:42:58 +0800
Subject: [PATCH] =?UTF-8?q?feat(oa):=20=E6=B7=BB=E5=8A=A0=E4=BA=A4?=
 =?UTF-8?q?=E4=BB=98=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E5=92=8C=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 OaDeliveryOrder 实体类中新增 status 和 accessory 字段
- 在 OaDeliveryOrderBo 业务对象中新增 status 和 accessory 字段
- 在 OaDeliveryOrderMapper.xml 中配置 status 和 accessory 的映射关系
- 在 OaDeliveryOrderVo 视图对象中新增 status 和 accessory 字段
- 更新数据库查询结果映射以包含新的字段信息
---
 .../src/main/java/com/ruoyi/oa/domain/OaDeliveryOrder.java   | 4 ++++
 .../main/java/com/ruoyi/oa/domain/bo/OaDeliveryOrderBo.java  | 5 +++++
 .../main/java/com/ruoyi/oa/domain/vo/OaDeliveryOrderVo.java  | 5 +++++
 .../src/main/resources/mapper/oa/OaDeliveryOrderMapper.xml   | 4 ++++
 4 files changed, 18 insertions(+)

diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaDeliveryOrder.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaDeliveryOrder.java
index caa334a..abc9153 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaDeliveryOrder.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaDeliveryOrder.java
@@ -101,4 +101,8 @@ public class OaDeliveryOrder extends BaseEntity {
      */
     private String remark;
 
+
+    //状态和附件
+    private Integer status;
+    private String accessory;
 }
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaDeliveryOrderBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaDeliveryOrderBo.java
index 0e95049..95df584 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaDeliveryOrderBo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaDeliveryOrderBo.java
@@ -124,4 +124,9 @@ public class OaDeliveryOrderBo extends BaseEntity {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date endTime;
 
+
+    //状态和附件
+    private Integer status;
+    private String accessory;
+
 }
diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaDeliveryOrderVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaDeliveryOrderVo.java
index 31f4f22..4fe24dc 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaDeliveryOrderVo.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaDeliveryOrderVo.java
@@ -136,4 +136,9 @@ public class OaDeliveryOrderVo {
     private String projectNum;
 
 
+    //状态和附件
+    private Integer status;
+    private String accessory;
+
+
 }
diff --git a/ruoyi-oa/src/main/resources/mapper/oa/OaDeliveryOrderMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/OaDeliveryOrderMapper.xml
index 3d57cf2..8d09336 100644
--- a/ruoyi-oa/src/main/resources/mapper/oa/OaDeliveryOrderMapper.xml
+++ b/ruoyi-oa/src/main/resources/mapper/oa/OaDeliveryOrderMapper.xml
@@ -22,6 +22,8 @@
         <result property="actualReceiver" column="actual_receiver"/>
         <result property="constructionCompany" column="construction_company"/>
         <result property="deliveryRemark" column="delivery_remark"/>
+        <result property="status" column="status"/>
+        <result property="accessory" column="accessory"/>
         <result property="delFlag" column="del_flag"/>
         <result property="remark" column="remark"/>
         <result property="createBy" column="create_by"/>
@@ -48,6 +50,8 @@
             odo.actual_receiver AS actualReceiver,
             odo.construction_company AS constructionCompany,
             odo.delivery_remark AS deliveryRemark,
+            odo.status AS status,
+            odo.accessory AS accessory,
             p.project_name AS projectName,
             p.project_code AS projectCode,
             p.project_num AS projectNum