From d574a6b142ddc4682dd788a694697ba554fb77bb Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 16 Dec 2024 12:44:27 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=94=AF=E4=B8=80=E6=A0=87?=
 =?UTF-8?q?=E8=AF=86=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/material/device/domain/DevInfo.java    | 5 +++++
 .../resources/mapper/material/device/DevInfoMapper.xml    | 8 +++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java
index 2cee947..31fbc28 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java
@@ -47,6 +47,11 @@ public class DevInfo extends BaseEntity {
     @ApiModelProperty(value = "设备编码")
     private String code;
 
+    /** 设备唯一标识符，用户输入，比如车架号 */
+    @Excel(name = "设备唯一标识符")
+    @ApiModelProperty(value = "设备唯一标识符")
+    private String identifyCode;
+
     @ApiModelProperty(value = "装备名称")
     @NotBlank
     private String deviceName;
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
index 945eff8..95582e3 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="com.bonus.material.device.domain.vo.DevInfoVo" id="DevInfoResult">
         <result property="maId"    column="ma_id"    />
         <result property="code"    column="code"    />
+        <result property="identifyCode"    column="identify_code"    />
         <result property="typeId"    column="type_id"    />
         <result property="maStatus"    column="ma_status"    />
         <result property="leaseScope"    column="lease_scope"    />
@@ -43,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDevInfoVo">
-        select ma_id, device_name, device_weight, device_count, code, type_id, ma_status, lease_scope, location, province_id, city_id, area_id, brand, model_name, production_date, working_hours, serial_number,
+        select ma_id, device_name, device_weight, device_count, code, identify_code, type_id, ma_status, lease_scope, location, province_id, city_id, area_id, brand, model_name, production_date, working_hours, serial_number,
                pic_url, js_month_price, js_day_price, description, gps_code, own_co, create_time,
                creator, update_time, person, person_phone, update_by, specification, deposit, is_operator, is_active, update_time, update_by
         from ma_dev_info
@@ -53,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             d.ma_id as maId,
             d.code as code,
+            d.identify_code as identifyCode,
             d.device_name as deviceName,
             d.device_weight as deviceWeight,
             d.device_count as deviceCount,
@@ -170,6 +172,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
         d.ma_id as maId,
         d.code as code,
+        d.identify_code as identifyCode,
         d.device_name as deviceName,
         d.device_count as deviceCount,
         d.device_weight as deviceWeight,
@@ -215,6 +218,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             d.ma_id as maId,
             d.code as code,
+            identify_code as identifyCode,
             d.device_name as deviceName,
             d.device_weight as deviceWeight,
             d.device_count as deviceCount,
@@ -273,6 +277,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceWeight != null and  deviceWeight != '' ">device_weight,</if>
             <if test="deviceCount != null">device_count,</if>
             <if test="code != null and  code != '' ">code,</if>
+            <if test="identifyCode != null and  identifyCode != '' ">identify_code,</if>
             <if test="typeId != null and  typeId != ''">type_id,</if>
             <if test="maStatus != null">ma_status,</if>
             <if test="leaseScope != null and  leaseScope != ''">lease_scope,</if>
@@ -600,6 +605,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceWeight != null and  deviceWeight != '' ">device_weight,</if>
             <if test="deviceCount != null">device_count,</if>
             <if test="code != null and  code != '' ">code,</if>
+            <if test="identifyCode != null and  identifyCode != '' ">identify_code,</if>
             <if test="typeId != null and  typeId != ''">type_id,</if>
             <if test="maStatus != null">ma_status,</if>
             <if test="leaseScope != null and  leaseScope != ''">lease_scope,</if>