From 5d9bdce9de02895e88faaf6c7cea33d346314d7b Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Wed, 17 Dec 2025 10:16:52 +0800 Subject: [PATCH] =?UTF-8?q?feat(oa):=20=E6=96=B0=E5=A2=9E=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E5=8D=95=E6=98=8E=E7=BB=86=E7=8A=B6=E6=80=81=E5=92=8C?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 OaDeliveryOrderDetail 实体类中新增 status 和 accessory 字段 - 在 OaDeliveryOrderDetailBo 业务对象中新增 status 和 accessory 字段 - 在 OaDeliveryOrderDetailVo 视图对象中新增 status 和 accessory 字段 - 更新 MyBatis Mapper XML 文件,映射新增的 status 和 accessory 字段 - 数据库查询结果集中包含新增的 status 和 accessory 字段 --- .../main/java/com/ruoyi/oa/domain/OaDeliveryOrderDetail.java | 5 +++++ .../java/com/ruoyi/oa/domain/bo/OaDeliveryOrderDetailBo.java | 4 +++- .../java/com/ruoyi/oa/domain/vo/OaDeliveryOrderDetailVo.java | 3 +++ .../main/resources/mapper/oa/OaDeliveryOrderDetailMapper.xml | 4 ++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaDeliveryOrderDetail.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaDeliveryOrderDetail.java index 3a1f258..fe78f0c 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaDeliveryOrderDetail.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaDeliveryOrderDetail.java @@ -94,4 +94,9 @@ public class OaDeliveryOrderDetail extends BaseEntity { */ private String remark; + + //状态和附件 + private Integer status; + private String accessory; + } diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaDeliveryOrderDetailBo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaDeliveryOrderDetailBo.java index da7626b..04aecdc 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaDeliveryOrderDetailBo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaDeliveryOrderDetailBo.java @@ -111,5 +111,7 @@ public class OaDeliveryOrderDetailBo 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/OaDeliveryOrderDetailVo.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaDeliveryOrderDetailVo.java index a9dbcd3..2adc61f 100644 --- a/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaDeliveryOrderDetailVo.java +++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaDeliveryOrderDetailVo.java @@ -131,5 +131,8 @@ public class OaDeliveryOrderDetailVo { @ExcelProperty(value = "备注") private String remark; + //状态和附件 + private Integer status; + private String accessory; } diff --git a/ruoyi-oa/src/main/resources/mapper/oa/OaDeliveryOrderDetailMapper.xml b/ruoyi-oa/src/main/resources/mapper/oa/OaDeliveryOrderDetailMapper.xml index f586d17..1e3f203 100644 --- a/ruoyi-oa/src/main/resources/mapper/oa/OaDeliveryOrderDetailMapper.xml +++ b/ruoyi-oa/src/main/resources/mapper/oa/OaDeliveryOrderDetailMapper.xml @@ -20,6 +20,8 @@ + + @@ -44,6 +46,8 @@ volume, box_size AS boxSize, detail_remark AS detailRemark, + status, + accessory, del_flag AS delFlag, remark, create_by AS createBy,