From 154e17ad50e2c1b0b6c3b7958b65093e87007319 Mon Sep 17 00:00:00 2001
From: syruan <15555146157@163.com>
Date: Sat, 13 Sep 2025 20:25:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A3=85=E5=A4=87=E5=8E=9F?=
 =?UTF-8?q?=E5=80=BC=E5=92=8C=E8=A7=84=E6=A0=BC=E5=90=8D=E7=A7=B0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 DevInfo 类中添加 buyPrice 和 itemTypeModel 字段
- 更新 DevInfoMapper.xml，增加新字段的映射和操作
---
 .../com/bonus/material/device/domain/DevInfo.java    | 12 ++++++++++++
 .../mapper/material/device/DevInfoMapper.xml         |  8 ++++++++
 2 files changed, 20 insertions(+)

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 f0dd929..60bf9df 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
@@ -82,6 +82,18 @@ public class DevInfo extends BaseEntity {
     @NotBlank(message = "单位不能为空")
     private String unitName;
 
+    /**
+     * 装备原值-- 250913应对地市公司录入临时采用此字段(田聪聪要求)
+     */
+    @ApiModelProperty(value = "装备原值")
+    private BigDecimal buyPrice;
+
+    /**
+     * 规格名称-- 250913应对地市公司录入临时采用此字段(田聪聪要求)
+     */
+    @ApiModelProperty(value = "规格名称")
+    private String itemTypeModel;
+
     /**
      * 类型id
      */
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 31c4b2f..93dff3a 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
@@ -226,6 +226,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
             d.ma_id as maId,
             d.code as code,
+            d.buy_price as buyPrice,
+            d.item_type_model as itemTypeModel,
             identify_code as identifyCode,
             d.device_name as deviceName,
             d.device_weight as deviceWeight,
@@ -323,6 +325,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="checkCycle != null">check_cycle,</if>
             <if test="isZone != null">is_zone,</if>
             <if test="zoneId != null">zone_id,</if>
+            <if test="buyPrice != null">buy_price,</if>
+            <if test="itemTypeModel != null">item_type_model,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deviceName != null and deviceName != ''">#{deviceName},</if>
@@ -364,6 +368,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="checkCycle != null">#{checkCycle},</if>
             <if test="isZone != null">#{isZone},</if>
             <if test="zoneId != null">#{zoneId},</if>
+            <if test="buyPrice != null">#{buyPrice},</if>
+            <if test="itemTypeModel != null">#{itemTypeModel},</if>
          </trim>
     </insert>
 
@@ -416,6 +422,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="checkCycle != null">check_cycle = #{checkCycle},</if>
             <if test="isZone != null">is_zone = #{isZone},</if>
             <if test="zoneId != null">zone_id = #{zoneId},</if>
+            <if test="buyPrice != null">buy_price = #{buyPrice},</if>
+            <if test="itemTypeModel != null">item_type_model = #{itemTypeModel},</if>
             update_time = now()
         </trim>
         where ma_id = #{maId}