From 5030f3d30ccc1bd16db371c6970a48103aff9191 Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期一, 03 六月 2024 13:56:57 +0800
Subject: [PATCH] 380新产品,优化

---
 jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml b/jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml
index c6bcddd..9ccd8f1 100644
--- a/jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jcdm.main.bs.orderScheduling.mapper.BsOrderSchedulingMapper">
-    
+
     <resultMap type="BsOrderScheduling" id="BsOrderSchedulingResult">
         <result property="id"    column="id"    />
         <result property="orderNo"    column="order_no"    />
@@ -47,7 +47,7 @@
 
     <select id="selectBsOrderSchedulingList" parameterType="BsOrderScheduling" resultMap="BsOrderSchedulingResult">
         <include refid="selectBsOrderSchedulingVo"/>
-        <where>  
+        <where>
             <if test="orderNo != null  and orderNo != ''"> and order_no = #{orderNo}</if>
             <if test="engineNo != null  and engineNo != ''"> and engine_no = #{engineNo}</if>
             <if test="productType != null  and productType != ''"> and product_type = #{productType}</if>
@@ -64,8 +64,8 @@
             <if test="operator != null  and operator != ''"> and operator = #{operator}</if>
             <if test="operateTime != null  and operateTime != ''"> and operate_time = #{operateTime}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
-            <if test="spareField1 != null  and spareField1 != ''"> and spare_field_1 = #{spareField1}</if>
-            <if test="spareField2 != null  and spareField2 != ''"> and spare_field_2 = #{spareField2}</if>
+            <if test="spareField1 != null  and spareField1 != ''"> and isnull(spare_field_1,'') != #{spareField1}</if>
+            <if test="spareField2 != null  and spareField2 != ''"> and isnull(spare_field_2,'') != #{spareField2}</if>
             <if test="spareField3 != null  and spareField3 != ''"> and spare_field_3 = #{spareField3}</if>
             <if test="spareField4 != null  and spareField4 != ''"> and spare_field_4 = #{spareField4}</if>
             <if test="createUser != null  and createUser != ''"> and create_user = #{createUser}</if>
@@ -146,7 +146,7 @@
         </where>
         order by create_time DESC
     </select>
-    
+
     <select id="selectBsOrderSchedulingById" parameterType="Long" resultMap="BsOrderSchedulingResult">
         <include refid="selectBsOrderSchedulingVo"/>
         where id = #{id}
@@ -209,7 +209,7 @@
             <if test="finalAssemblyOfflineTime != null">final_assembly_offline_time,</if>
             <if test="cvtLaunchTime != null">cvt_launch_time,</if>
             <if test="cvtOfflineTime != null">cvt_offline_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderNo != null">#{orderNo},</if>
             <if test="engineNo != null">#{engineNo},</if>
@@ -292,7 +292,7 @@
     </delete>
 
     <delete id="deleteBsOrderSchedulingByIds" parameterType="String">
-        delete from bs_order_scheduling where id in 
+        delete from bs_order_scheduling where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

--
Gitblit v1.9.3