From 4afa387b237899d5f841a3070d04739772c22551 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 30 五月 2025 11:17:47 +0800
Subject: [PATCH] 规范二维码生成

---
 pms-parent/pms-global/src/main/resources/mapper/PrDeviceMapper.xml |   42 +++++++++++++++++++++---------------------
 1 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrDeviceMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrDeviceMapper.xml
index 0f7b0df..2bd1653 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrDeviceMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrDeviceMapper.xml
@@ -32,28 +32,28 @@
         delete from pr_device
         where  batch_id = #{batchId,jdbcType=BIGINT}
     </delete>
-    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrDevice" useGeneratedKeys="true">
+    <insert id="insert" parameterType="com.dy.pmsGlobal.pojoPr.PrDevice">
         insert into pr_device
         ( id,pro_id,batch_id
         ,device_no,status)
         values (#{id,jdbcType=BIGINT},#{proId,jdbcType=BIGINT},#{batchId,jdbcType=BIGINT}
         ,#{deviceNo,jdbcType=BIGINT},#{status,jdbcType=TINYINT})
     </insert>
-    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrDevice" useGeneratedKeys="true">
+    <insert id="insertSelective" parameterType="com.dy.pmsGlobal.pojoPr.PrDevice">
         insert into pr_device
         <trim prefix="(" suffix=")" suffixOverrides=",">
-                <if test="id != null and id !=''">id,</if>
-                <if test="proId != null and proId !=''">pro_id,</if>
-                <if test="batchId != null and batchId !=''">batch_id,</if>
+                <if test="id != null">id,</if>
+                <if test="proId != null">pro_id,</if>
+                <if test="batchId != null">batch_id,</if>
                 <if test="deviceNo != null and deviceNo !=''">device_no,</if>
-                <if test="status != null and status !=''">status,</if>
+                <if test="status != null">status,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-                <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
-                <if test="proId != null and proId !=''">#{proId,jdbcType=BIGINT},</if>
-                <if test="batchId != null and batchId !=''">#{batchId,jdbcType=BIGINT},</if>
+                <if test="id != null">#{id,jdbcType=BIGINT},</if>
+                <if test="proId != null">#{proId,jdbcType=BIGINT},</if>
+                <if test="batchId != null">#{batchId,jdbcType=BIGINT},</if>
                 <if test="deviceNo != null and deviceNo !=''">#{deviceNo},</if>
-                <if test="status != null and status !=''">#{status,jdbcType=TINYINT},</if>
+                <if test="status != null">#{status,jdbcType=TINYINT},</if>
         </trim>
     </insert>
     <insert id="insertBatch" parameterType="java.util.List">
@@ -72,16 +72,16 @@
     <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPr.PrDevice">
         update pr_device
         <set>
-                <if test="proId != null and proId !=''">
+                <if test="proId != null">
                     pro_id = #{proId,jdbcType=BIGINT},
                 </if>
-                <if test="batchId != null and batchId !=''">
+                <if test="batchId != null">
                     batch_id = #{batchId,jdbcType=BIGINT},
                 </if>
                 <if test="deviceNo != null and deviceNo !=''">
                     device_no = #{deviceNo},
                 </if>
-                <if test="status != null and status !=''">
+                <if test="status != null">
                     status = #{status,jdbcType=TINYINT}
                 </if>
         </set>
@@ -102,19 +102,19 @@
         <include refid="Base_Column_List" />
         from pr_device
         <trim prefix="where" suffixOverrides="and">
-                <if test="id != null and id !=''">
+                <if test="id != null">
                     id = #{id,jdbcType=BIGINT} and
                 </if>
-                <if test="proId != null and proId !=''">
+                <if test="proId != null">
                     pro_id = #{proId,jdbcType=BIGINT} and
                 </if>
-                <if test="batchId != null and batchId !=''">
+                <if test="batchId != null">
                     batch_id = #{batchId,jdbcType=BIGINT} and
                 </if>
                 <if test="deviceNo != null and deviceNo !=''">
                     device_no = #{deviceNo,jdbcType=BIGINT} and
                 </if>
-                <if test="status != null and status !=''">
+                <if test="status != null">
                     status = #{status,jdbcType=TINYINT} and
                 </if>
         </trim>
@@ -130,19 +130,19 @@
         select count(1)
         from pr_device
         <trim prefix="where" suffixOverrides="and">
-                <if test="id != null and id !=''">
+                <if test="id != null">
                     id = #{id,jdbcType=BIGINT} and
                 </if>
-                <if test="proId != null and proId !=''">
+                <if test="proId != null">
                     pro_id = #{proId,jdbcType=BIGINT} and
                 </if>
-                <if test="batchId != null and batchId !=''">
+                <if test="batchId != null">
                     batch_id = #{batchId,jdbcType=BIGINT} and
                 </if>
                 <if test="deviceNo != null and deviceNo !=''">
                     device_no = #{deviceNo,jdbcType=BIGINT} and
                 </if>
-                <if test="status != null and status !=''">
+                <if test="status != null">
                     status = #{status,jdbcType=TINYINT} and
                 </if>
         </trim>

--
Gitblit v1.8.0