From e4e81edd546ab4a0b1fc799a78b03b4fd0ca6548 Mon Sep 17 00:00:00 2001
From: syruan <15555146157@163.com>
Date: Mon, 22 Sep 2025 17:27:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=87=87=E9=9B=86=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E5=AD=97=E6=AE=B5=E5=88=B0=E8=AE=BE=E5=A4=87=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=A8=A1=E5=9E=8B=EF=BC=8C=E5=B9=B6=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/material/device/domain/DevInfo.java     | 6 ++++++
 .../resources/mapper/material/device/DevInfoMapper.xml     | 7 ++++++-
 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 c933295..d2b5d98 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
@@ -61,6 +61,12 @@ public class DevInfo extends BaseEntity {
     @ApiModelProperty(value = "设备唯一标识符")
     private String identifyCode;
 
+    /**
+     * 用户手动输入
+     */
+    @ApiModelProperty(value = "采集编号")
+    private String collectCode;
+
     @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 68f9ac7..8728251 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
@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectDevInfoVo">
         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, level_type,
+               pic_url, js_month_price, js_day_price, description, gps_code, own_co, create_time, level_type,collect_code,
                creator, update_time, person, person_phone, update_by, specification, deposit, is_operator, is_active, update_time, update_by
         from ma_dev_info
     </sql>
@@ -54,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             d.ma_id as maId,
             d.code as code,
+            d.collect_code as collectCode,
             d.identify_code as identifyCode,
             d.day_lease_price as dayLeasePrice,
             d.device_name as deviceName,
@@ -232,6 +233,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectDevInfoByMaId" parameterType="Long" resultType="com.bonus.material.device.domain.vo.DevInfoVo">
         SELECT d.ma_id                                                                     as maId,
                d.code                                                                      as code,
+                d.collect_code as collectCode,
                d.identify_code                                                             as identifyCode,
                d.device_name                                                               as deviceName,
                d.device_weight                                                             as deviceWeight,
@@ -308,6 +310,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceCount != null">device_count,</if>
             <if test="deviceUnitType != null and deviceUnitType != ''">device_unit_type,</if>
             <if test="code != null and  code != '' ">code,</if>
+            <if test="collectCode != null and collectCode != ''">collect_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>
@@ -356,6 +359,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceCount != null">#{deviceCount},</if>
             <if test="deviceUnitType != null and deviceUnitType != ''">#{deviceUnitType},</if>
             <if test="code != null and code != ''">#{code},</if>
+            <if test="collectCode != null and collectCode != ''">#{collectCode},</if>
             <if test="identifyCode != null and identifyCode != ''">#{identifyCode},</if>
             <if test="typeId != null and typeId != ''">#{typeId},</if>
             <if test="maStatus != null">#{maStatus},</if>
@@ -421,6 +425,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update ma_dev_info
         <trim prefix="SET" suffixOverrides=",">
             <if test="code != null and code != '' ">code = #{code},</if>
+            <if test="collectCode != null and collectCode != ''">collect_code = #{collectCode},</if>
             <if test="identifyCode != null and identifyCode != '' ">identify_code = #{identifyCode},</if>
             <if test="deviceName != null and deviceName != '' ">device_name = #{deviceName},</if>
             <if test="deviceWeight != null">device_weight = #{deviceWeight},</if>