From 591e3b8a10ed15023f3ad9e5a72a887ef89b0bb2 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期一, 26 八月 2024 20:47:46 +0800
Subject: [PATCH] 修改判空方式

---
 pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml |  154 +++++++++++++++++++++++++-------------------------
 1 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
index 7a21c13..d2bb637 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
@@ -95,7 +95,7 @@
         select count(1)
         from pr_assembly_plan
         where deleted = 0
-        <if test="id != null">
+        <if test="id != null and id !=''">
             and process_id = #{id}
         </if>
     </select>
@@ -133,43 +133,43 @@
         <include refid="Base_Column_List"/>
         from pr_assembly_plan
         <trim prefix="where" suffixOverrides="and">
-            <if test="orderId != null">
+            <if test="orderId!= null and orderId !=''">
                 order_id = #{orderId,jdbcType=BIGINT} and
             </if>
-            <if test="proId != null">
+            <if test="proId != null and proId !=''">
                 pro_id = #{proId,jdbcType=BIGINT} and
             </if>
-            <if test="batchId != null">
+            <if test="batchId != null and batchId !=''">
                 batch_id = #{batchId,jdbcType=BIGINT} and
             </if>
-            <if test="processId != null">
+            <if test="processId!= null and processId !=''">
                 process_id = #{processId,jdbcType=BIGINT} and
             </if>
-            <if test="name != null">
+            <if test="name != null and name !=''">
                 name = #{name,jdbcType=VARCHAR} and
             </if>
-            <if test="number != null">
+            <if test="number != null and number !=''">
                 number = #{number,jdbcType=INTEGER} and
             </if>
-            <if test="status != null">
+            <if test="status != null and status !=''">
                 status = #{status,jdbcType=TINYINT} and
             </if>
-            <if test="creator != null">
+            <if test="creator != null and creator !=''">
                 creator = #{creator,jdbcType=VARCHAR} and
             </if>
-            <if test="dt != null">
+            <if test="dt != null and dt !=''">
                 dt = #{dt,jdbcType=TIMESTAMP} and
             </if>
-            <if test="startDate != null">
+            <if test="startDate != null and startDate !=''">
                 start_date = #{startDate,jdbcType=VARCHAR} and
             </if>
-            <if test="endDate != null">
+            <if test="endDate != null and endDate !=''">
                 end_date = #{endDate,jdbcType=VARCHAR} and
             </if>
-            <if test="deleted != null">
+            <if test="deleted != null and deleted !=''">
                 deleted = #{deleted,jdbcType=TINYINT} and
             </if>
-            <if test="content != null">
+            <if test="content != null and content !=''">
                 content = #{content,jdbcType=VARCHAR} and
             </if>
         </trim>
@@ -180,43 +180,43 @@
         <include refid="Base_Column_List"/>
         from pr_assembly_plan
         <trim prefix="where" suffixOverrides="and">
-            <if test="orderId != null">
+            <if test="orderId!= null and orderId !=''">
                 order_id = #{orderId,jdbcType=BIGINT} and
             </if>
-            <if test="proId != null">
+            <if test="proId != null and proId !=''">
                 pro_id = #{proId,jdbcType=BIGINT} and
             </if>
-            <if test="batchId != null">
+            <if test="batchId != null and batchId !=''">
                 batch_id = #{batchId,jdbcType=BIGINT} and
             </if>
-            <if test="processId != null">
+            <if test="processId!= null and processId !=''">
                 process_id = #{processId,jdbcType=BIGINT} and
             </if>
-            <if test="name != null">
+            <if test="name != null and name !=''">
                 name = #{name,jdbcType=VARCHAR} and
             </if>
-            <if test="number != null">
+            <if test="number != null and number !=''">
                 number = #{number,jdbcType=INTEGER} and
             </if>
-            <if test="status != null">
+            <if test="status != null and status !=''">
                 status = #{status,jdbcType=TINYINT} and
             </if>
-            <if test="creator != null">
+            <if test="creator != null and creator !=''">
                 creator = #{creator,jdbcType=VARCHAR} and
             </if>
-            <if test="dt != null">
+            <if test="dt != null and dt !=''">
                 dt = #{dt,jdbcType=TIMESTAMP} and
             </if>
-            <if test="startDate != null">
+            <if test="startDate != null and startDate !=''">
                 start_date = #{startDate,jdbcType=VARCHAR} and
             </if>
-            <if test="endDate != null">
+            <if test="endDate != null and endDate !=''">
                 end_date = #{endDate,jdbcType=VARCHAR} and
             </if>
-            <if test="deleted != null">
+            <if test="deleted != null and deleted !=''">
                 deleted = #{deleted,jdbcType=TINYINT} and
             </if>
-            <if test="content != null">
+            <if test="content != null and content !=''">
                 content = #{content,jdbcType=VARCHAR} and
             </if>
         </trim>
@@ -247,88 +247,88 @@
             useGeneratedKeys="true">
         insert into pr_assembly_plan
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">id,</if>
-            <if test="orderId != null">order_id,</if>
-            <if test="proId != null">pro_id,</if>
-            <if test="batchId != null">batch_id,</if>
-            <if test="processId != null">process_id,</if>
-            <if test="name != null">name,</if>
-            <if test="number != null">number,</if>
-            <if test="status != null">status,</if>
-            <if test="creator != null">creator,</if>
-            <if test="dt != null">dt,</if>
-            <if test="startDate != null">start_date,</if>
-            <if test="endDate != null">end_date,</if>
-            <if test="deleted != null">deleted,</if>
-            <if test="content != null">content,</if>
-            <if test="inputNumber != null">input_number,</if>
-            <if test="outputNumber != null">output_number,</if>
+            <if test="id != null and id !=''">id,</if>
+            <if test="orderId!= null and orderId !=''">order_id,</if>
+            <if test="proId != null and proId !=''">pro_id,</if>
+            <if test="batchId != null and batchId !=''">batch_id,</if>
+            <if test="processId != null and processId !=''">process_id,</if>
+            <if test="name != null and name !=''">name,</if>
+            <if test="number != null and number !=''">number,</if>
+            <if test="status != null and status !=''">status,</if>
+            <if test="creator != null and creator !=''">creator,</if>
+            <if test="dt != null and dt !=''">dt,</if>
+            <if test="startDate != null and startDate !=''">start_date,</if>
+            <if test="endDate != null and endDate !=''">end_date,</if>
+            <if test="deleted != null and deleted !=''">deleted,</if>
+            <if test="content != null and content !=''">content,</if>
+            <if test="inputNumber!= null and inputNumber !=''">input_number,</if>
+            <if test="outputNumber!= null and outputNumber !=''">output_number,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">#{id,jdbcType=BIGINT},</if>
-            <if test="orderId != null">#{orderId,jdbcType=BIGINT},</if>
-            <if test="proId != null">#{proId,jdbcType=BIGINT},</if>
-            <if test="batchId != null">#{batchId,jdbcType=BIGINT},</if>
-            <if test="processId != null">#{processId,jdbcType=BIGINT},</if>
-            <if test="name != null">#{name,jdbcType=VARCHAR},</if>
-            <if test="number != null">#{number,jdbcType=INTEGER},</if>
-            <if test="status != null">#{status,jdbcType=TINYINT},</if>
-            <if test="creator != null">#{creator,jdbcType=VARCHAR},</if>
-            <if test="dt != null">#{dt,jdbcType=TIMESTAMP},</if>
-            <if test="startDate != null">#{startDate,jdbcType=VARCHAR},</if>
-            <if test="endDate != null">#{endDate,jdbcType=VARCHAR},</if>
-            <if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
-            <if test="content != null">#{content,jdbcType=VARCHAR},</if>
-            <if test="inputNumber != null">#{inputNumber,jdbcType=INTEGER},</if>
-            <if test="outputNumber != null">#{outputNumber,jdbcType=INTEGER},</if>
+            <if test="id != null and id !=''">#{id,jdbcType=BIGINT},</if>
+            <if test="orderId!= null and orderId !=''">#{orderId,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="processId != null and processId !=''">#{processId,jdbcType=BIGINT},</if>
+            <if test="name != null and name !=''">#{name,jdbcType=VARCHAR},</if>
+            <if test="number != null and number !=''">#{number,jdbcType=INTEGER},</if>
+            <if test="status != null and status !=''">#{status,jdbcType=TINYINT},</if>
+            <if test="creator != null and creator !=''">#{creator,jdbcType=VARCHAR},</if>
+            <if test="dt != null and dt !=''">#{dt,jdbcType=TIMESTAMP},</if>
+            <if test="startDate != null and startDate !=''">#{startDate,jdbcType=VARCHAR},</if>
+            <if test="endDate != null and endDate !=''">#{endDate,jdbcType=VARCHAR},</if>
+            <if test="deleted != null and deleted !=''">#{deleted,jdbcType=TINYINT},</if>
+            <if test="content != null and content !=''">#{content,jdbcType=VARCHAR},</if>
+            <if test="inputNumber!= null and inputNumber !=''">#{inputNumber,jdbcType=INTEGER},</if>
+            <if test="outputNumber!= null and outputNumber !=''">#{outputNumber,jdbcType=INTEGER},</if>
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPr.PrAssemblyPlan">
         update pr_assembly_plan
         <set>
-            <if test="orderId != null">
+            <if test="orderId!= null and orderId !=''">
                 order_id = #{orderId,jdbcType=BIGINT} ,
             </if>
-            <if test="proId != null">
+            <if test="proId != null and proId !=''">
                 pro_id = #{proId,jdbcType=BIGINT},
             </if>
-            <if test="batchId != null">
+            <if test="batchId != null and batchId !=''">
                 batch_id = #{batchId,jdbcType=BIGINT},
             </if>
-            <if test="processId != null">
+            <if test="processId!= null and processId !=''">
                 process_id = #{processId,jdbcType=BIGINT},
             </if>
-            <if test="name != null">
+            <if test="name != null and name !=''">
                 name = #{name,jdbcType=VARCHAR},
             </if>
-            <if test="number != null">
+            <if test="number != null and number !=''">
                 number = #{number,jdbcType=INTEGER},
             </if>
-            <if test="status != null">
+            <if test="status != null and status !=''">
                 status = #{status,jdbcType=TINYINT},
             </if>
-            <if test="creator != null">
+            <if test="creator != null and creator !=''">
                 creator = #{creator,jdbcType=VARCHAR},
             </if>
-            <if test="dt != null">
+            <if test="dt != null and dt !=''">
                 dt = #{dt,jdbcType=TIMESTAMP},
             </if>
-            <if test="startDate != null">
+            <if test="startDate != null and startDate !=''">
                 start_date = #{startDate,jdbcType=VARCHAR},
             </if>
-            <if test="endDate != null">
+            <if test="endDate != null and endDate !=''">
                 end_date = #{endDate,jdbcType=VARCHAR},
             </if>
-            <if test="deleted != null">
+            <if test="deleted != null and deleted !=''">
                 deleted = #{deleted,jdbcType=TINYINT},
             </if>
-            <if test="content != null">
+            <if test="content != null and content !=''">
                 content = #{content,jdbcType=VARCHAR},
             </if>
-            <if test="inputNumber != null">
+            <if test="inputNumber!= null and inputNumber !=''">
                 input_number = #{inputNumber,jdbcType=INTEGER},
             </if>
-            <if test="outputNumber != null">
+            <if test="outputNumber!= null and outputNumber !=''">
                 output_number = #{outputNumber,jdbcType=INTEGER},
             </if>
         </set>
@@ -360,7 +360,7 @@
         <include refid="Base_Column_List"/>
         from pr_assembly_plan
         <trim prefix="where" suffixOverrides="and">
-            <if test="proId != null">
+            <if test="proId != null and proId !=''">
                 pro_id = #{proId,jdbcType=BIGINT} and
             </if>
             <if test="startDate != null and startDate != '' ">
@@ -382,7 +382,7 @@
         select count(1)
         from pr_assembly_plan
         <trim prefix="where" suffixOverrides="and">
-            <if test="proId != null">
+            <if test="proId != null and proId !=''">
                 pro_id = #{proId,jdbcType=BIGINT} and
             </if>
             <if test="startDate != null and startDate != '' ">
@@ -397,7 +397,7 @@
         select count(1) > 0
         from pr_assembly_plan
         where name = #{name,jdbcType=VARCHAR}
-        <if test="id != null">
+        <if test="id != null and id !=''">
             and id != #{id,jdbcType=BIGINT}
         </if>
     </select>

--
Gitblit v1.8.0