From ced8513428628b49aeb4a342b59f251789f5219f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com>
Date: Mon, 8 Sep 2025 14:13:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=87=BA=E5=9C=BA=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/bmw/domain/po/PmAttDevice.java    |  5 +++++
 .../java/com/bonus/bmw/domain/vo/PmAttDeviceVo.java  |  5 +++++
 .../main/resources/mapper/bmw/PmAttDeviceMapper.xml  | 12 ++++++++----
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmAttDevice.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmAttDevice.java
index debf616..064d290 100644
--- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmAttDevice.java
+++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/po/PmAttDevice.java
@@ -22,6 +22,11 @@ public class PmAttDevice {
      */
     private String deviceName;
 
+    /**
+     * 出场编号
+     */
+    private String serialNumber;
+
     /**
      * 工程id
      */
diff --git a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/PmAttDeviceVo.java b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/PmAttDeviceVo.java
index 2de0a46..486b93a 100644
--- a/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/PmAttDeviceVo.java
+++ b/bonus-modules/bonus-bmw/src/main/java/com/bonus/bmw/domain/vo/PmAttDeviceVo.java
@@ -25,6 +25,11 @@ public class PmAttDeviceVo {
     @Excel(name = "考勤机名称",sort = 2)
     private String deviceName;
 
+    /**
+     * 出场编号
+     */
+    private String serialNumber;
+
     /**
      * 工程id
      */
diff --git a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmAttDeviceMapper.xml b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmAttDeviceMapper.xml
index 8acfc0f..2e5cba9 100644
--- a/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmAttDeviceMapper.xml
+++ b/bonus-modules/bonus-bmw/src/main/resources/mapper/bmw/PmAttDeviceMapper.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.bonus.bmw.mapper.PmAttDeviceMapper">
     <insert id="addPmAttDevice">
-        insert into pm_att_device (device_code, device_name, pro_id,create_user, update_user,
+        insert into pm_att_device (device_code, device_name,serial_number, pro_id,create_user, update_user,
                                    create_time, update_time,dev_model,on_line)
-        values (#{deviceCode}, #{deviceName},#{proId}, #{createUser}, #{updateUser},
+        values (#{deviceCode}, #{deviceName},#{serialNumber},#{proId}, #{createUser}, #{updateUser},
                 #{createTime}, #{updateTime},#{devModel},#{onLine})
     </insert>
     <insert id="addPmAttDeviceHis">
-        insert into pm_att_device_his (device_code, device_name, pro_id,create_user, update_user,
+        insert into pm_att_device_his (device_code, device_name,serial_number, pro_id,create_user, update_user,
                                    create_time, update_time)
-        values (#{deviceCode}, #{deviceName},#{proId}, #{createUser}, #{updateUser},
+        values (#{deviceCode}, #{deviceName},#{serialNumber},#{proId}, #{createUser}, #{updateUser},
                 #{createTime}, #{updateTime})
     </insert>
     <update id="updatePmAttDevice">
@@ -24,6 +24,7 @@
     <select id="selectPmAttDeviceList" resultType="com.bonus.bmw.domain.vo.PmAttDeviceVo">
         select pad2.device_code as deviceCode,
                pad2.device_name as deviceName,
+               pad2.serial_number as serialNumber,
                pad2.pro_id as proId,
                pp.pro_name as proName,
                pp.is_shanghai as isShanghai,
@@ -35,6 +36,9 @@
         <if test="deviceCode!=null and deviceCode!=''">
             and pad2.device_code  LIKE CONCAT('%', #{deviceCode}, '%')
         </if>
+        <if test="serialNumber!=null and serialNumber!=''">
+            and pad2.serial_number  LIKE CONCAT('%', #{serialNumber}, '%')
+        </if>
         <if test="deviceName!=null and deviceName!=''">
             and pad2.device_name  LIKE CONCAT('%', #{deviceName}, '%')
         </if>