From 7d896321ae9023155a9f8c9ff6cd01482da46bf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A3=B7=E5=8F=B6?=
 <14103883+leaf-phos@user.noreply.gitee.com>
Date: Tue, 4 Mar 2025 13:36:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=90=86=E5=95=86=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/ss/device/domain/Device.java     | 3 +++
 .../src/main/java/com/ruoyi/ss/device/domain/DeviceBO.java   | 3 +++
 .../main/java/com/ruoyi/ss/device/mapper/DeviceMapper.xml    | 5 +++++
 3 files changed, 11 insertions(+)

diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/Device.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/Device.java
index 588821da..3bf0e99c 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/Device.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/Device.java
@@ -281,4 +281,7 @@ public class Device extends BaseEntity
 
     @ApiModelProperty("电量系数")
     private BigDecimal wxs;
+
+    @ApiModelProperty("代理商备注")
+    private String agentRemark;
 }
diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/DeviceBO.java b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/DeviceBO.java
index aeb9fae8..d2760810 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/DeviceBO.java
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/domain/DeviceBO.java
@@ -42,6 +42,7 @@ public class DeviceBO extends Device {
         bo.setAgentServiceRate(getAgentServiceRate());
         bo.setAgentId(getAgentId());
         bo.setMonthFee(getMonthFee());
+        bo.setAgentRemark(getAgentRemark());
         return bo;
     }
 
@@ -73,6 +74,7 @@ public class DeviceBO extends Device {
         bo.setAgentServiceRate(getAgentServiceRate());
         bo.setAgentId(getAgentId());
         bo.setMonthFee(getMonthFee());
+        bo.setAgentRemark(getAgentRemark());
         return bo;
     }
 
@@ -84,6 +86,7 @@ public class DeviceBO extends Device {
         DeviceBO bo = new DeviceBO();
         bo.setDeviceId(getDeviceId());
         bo.setAgentServiceRate(getAgentServiceRate());
+        bo.setAgentRemark(getAgentRemark());
         return bo;
     }
 }
diff --git a/smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.xml b/smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.xml
index 60393ae0..32978d4f 100644
--- a/smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.xml
+++ b/smart-switch-service/src/main/java/com/ruoyi/ss/device/mapper/DeviceMapper.xml
@@ -75,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             sd.user_opera_ele,
             sd.imsi,
             sd.wxs,
+            sd.agent_remark,
             sm.model_name as model,
             sm.picture as picture,
             sm.tags as  model_tags,
@@ -141,6 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="query.excludeDeviceId != null"> and sd.device_id != #{query.excludeDeviceId}</if>
         <if test="query.userOperaType != null  and query.userOperaType != ''"> and user_opera_type = #{query.userOperaType}</if>
         <if test="query.imsi != null  and query.imsi != ''"> and sd.imsi like concat('%', #{query.imsi}, '%')</if>
+        <if test="query.agentRemark != null  and query.agentRemark != ''"> and sd.agent_remark like concat('%', #{query.agentRemark}, '%')</if>
         <if test="query.inStaff != null">
             and sd.store_id
             <if test="!query.inStaff">not</if>
@@ -418,6 +420,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userOperaEle != null">user_opera_ele,</if>
             <if test="imsi != null">imsi,</if>
             <if test="wxs != null">wxs,</if>
+            <if test="agentRemark != null">agent_remark,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="storeId != null">#{storeId},</if>
@@ -478,6 +481,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userOperaEle != null">#{userOperaEle},</if>
             <if test="imsi != null">#{imsi},</if>
             <if test="wxs != null">#{wxs},</if>
+            <if test="agentRemark != null">#{agentRemark},</if>
          </trim>
     </insert>
 
@@ -571,6 +575,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userOperaEle != null">user_opera_ele = #{userOperaEle},</if>
             <if test="imsi != null">imsi = #{imsi},</if>
             <if test="wxs != null">wxs = #{wxs},</if>
+            <if test="agentRemark != null">agent_remark = #{agentRemark},</if>
         </trim>
         where device_id = #{deviceId}
     </update>