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,