锅炉排期

tz-module-pressure2/tz-module-pressure2-biz/src/main/resources/mapper/equipboilerscheduling/EquipBoilerSchedulingMapper.xml

@@ -121,13 +121,13 @@
                 OR (eb.NEXT_PRESSURE_CHECK_DATE BETWEEN #{nextDate[0]} AND #{nextDate[1]})
                 )
             </if>
-            <if test="nextDate != null and nextDate.size() >= 2 and sort == 'nextInCheckDate' and order != null or order != ''">
+            <if test="nextDate != null and nextDate.size() >= 2 and sort == 'nextInCheckDate' and order != null and order != ''">
                 AND eb.NEXT_IN_CHECK_DATE BETWEEN #{nextDate[0]} AND #{nextDate[1]}
             </if>
-            <if test="nextDate != null and nextDate.size() >= 2 and sort == 'nextOutCheckDate' and order != null or order != ''">
+            <if test="nextDate != null and nextDate.size() >= 2 and sort == 'nextOutCheckDate' and order != null and order != ''">
                 AND eb.NEXT_OUT_CHECK_DATE BETWEEN #{nextDate[0]} AND #{nextDate[1]}
             </if>
-            <if test="nextDate != null and nextDate.size() >= 2 and sort == 'nextPressureCheckDate' and order != null or order != ''">
+            <if test="nextDate != null and nextDate.size() >= 2 and sort == 'nextPressureCheckDate' and order != null and order != ''">
                 AND eb.NEXT_PRESSURE_CHECK_DATE BETWEEN #{nextDate[0]} AND #{nextDate[1]}
             </if>
             <if test="typeList != null and typeList.size() > 0">
@@ -250,13 +250,13 @@
                 OR (eb.NEXT_PRESSURE_CHECK_DATE BETWEEN #{nextDate[0]} AND #{nextDate[1]})
                 )
             </if>
-            <if test="nextDate != null and nextDate.size() >= 2 and sort == 'nextInCheckDate' and order != null or order != ''">
+            <if test="nextDate != null and nextDate.size() >= 2 and sort == 'nextInCheckDate' and order != null and order != ''">
                 AND eb.NEXT_IN_CHECK_DATE BETWEEN #{nextDate[0]} AND #{nextDate[1]}
             </if>
-            <if test="nextDate != null and nextDate.size() >= 2 and sort == 'nextOutCheckDate' and order != null or order != ''">
+            <if test="nextDate != null and nextDate.size() >= 2 and sort == 'nextOutCheckDate' and order != null and order != ''">
                 AND eb.NEXT_OUT_CHECK_DATE BETWEEN #{nextDate[0]} AND #{nextDate[1]}
             </if>
-            <if test="nextDate != null and nextDate.size() >= 2 and sort == 'nextPressureCheckDate' and order != null or order != ''">
+            <if test="nextDate != null and nextDate.size() >= 2 and sort == 'nextPressureCheckDate' and order != null and order != ''">
                 AND eb.NEXT_PRESSURE_CHECK_DATE BETWEEN #{nextDate[0]} AND #{nextDate[1]}
             </if>
             <if test="typeList != null and typeList.size() > 0">