Merge remote-tracking branch 'origin/dev' into dev

sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/MaLabelBindMapper.java

@@ -1,7 +1,9 @@
 package com.bonus.sgzb.base.mapper;
 import java.util.List;
 
+import com.bonus.sgzb.base.domain.MaLabelBind;
 import com.bonus.sgzb.base.vo.MaLabelBindVO;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * 机具设备标签ma_label_bindMapper接口
@@ -9,6 +11,7 @@ import com.bonus.sgzb.base.vo.MaLabelBindVO;
  * @author bonus
  * @date 2023-12-13
  */
+@Mapper
 public interface MaLabelBindMapper
 {
     /**
@@ -65,4 +68,6 @@ public interface MaLabelBindMapper
      * @return 结果
      */
     public int updateMaLabelBindByMaIds(Long maId);
+
+    int insertLabelBind(MaLabelBind maLabelBind);
 }

sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaLabelBindMapper.xml

@@ -87,6 +87,7 @@
     <insert id="insertMaLabelBindS" parameterType="com.bonus.sgzb.base.vo.MaLabelBindVO" useGeneratedKeys="true" keyProperty="maId">
         insert into ma_label_bind
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="maId != null">ma_id,</if>
             <if test="labelCode != null">label_code,</if>
             <if test="typeId != null">type_id,</if>
             <if test="binder != null">binder,</if>
@@ -96,6 +97,7 @@
             <if test="status != null">status,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="maId != null">#{maId},</if>
             <if test="labelCode != null">#{labelCode},</if>
             <if test="typeId != null">#{typeId},</if>
             <if test="binder != null">#{binder},</if>
@@ -105,6 +107,30 @@
             <if test="status != null">#{status},</if>
         </trim>
     </insert>
+    <insert id="insertLabelBind">
+        insert into ma_label_bind
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="maId != null">ma_id,</if>
+            <if test="labelCode != null">label_code,</if>
+            <if test="typeId != null">type_id,</if>
+            <if test="binder != null">binder,</if>
+            <if test="labelType != null">label_type,</if>
+            <if test="companyId != null">company_id,</if>
+            <if test="isBind != null">binder_time,</if>
+            <if test="status != null">status,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="maId != null">#{maId},</if>
+            <if test="labelCode != null">#{labelCode},</if>
+            <if test="typeId != null">#{typeId},</if>
+            <if test="binder != null">#{binder},</if>
+            <if test="labelType != null">#{labelType},</if>
+            <if test="companyId != null">#{companyId},</if>
+            <if test="isBind != null">#{binderTime},</if>
+            <if test="status != null">#{status},</if>
+        </trim>
+    </insert>
+    </insert>
     <update id="insertMaLabelBind" parameterType="com.bonus.sgzb.base.vo.MaLabelBindVO">
         update ma_label_bind
         <trim prefix="SET" suffixOverrides=",">