From 25e213e9d80263752acec8ed1957a80d4c220e86 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Tue, 17 Dec 2024 10:33:35 +0800
Subject: [PATCH] order detail improvement

---
 .../bonus/material/order/domain/OrderDetailDto.java   | 11 +++++++++++
 .../mapper/material/order/OrderInfoMapper.xml         |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java
index 6106fe0..2684a72 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderDetailDto.java
@@ -1,5 +1,6 @@
 package com.bonus.material.order.domain;
 
+import com.bonus.common.core.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -33,6 +34,16 @@ public class OrderDetailDto {
     @ApiModelProperty(value = "设备ids")
     private List<Integer> maIds;
 
+    /** 设备编码 */
+    @Excel(name = "设备编码")
+    @ApiModelProperty(value = "设备编码")
+    private String code;
+
+    /** 设备唯一标识符，用户输入，比如车架号 */
+    @Excel(name = "设备唯一标识符")
+    @ApiModelProperty(value = "设备唯一标识符")
+    private String identifyCode;
+
     @ApiModelProperty(value = "设备类型id")
     private Integer typeId;
 
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
index 7be760b..2cce02a 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/order/OrderInfoMapper.xml
@@ -155,6 +155,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectOrderDetailsById" resultType="com.bonus.material.order.domain.OrderDetailDto">
         SELECT
             mdi.device_name,
+            mdi.code,
+            mdi.identify_code,
             mt.lease_price as dayLeasePrice,
             hh.order_status,
             hh.days,