选择临检月份和检验类型排序时，只显示改检验类型在临检月份内的数据补充

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

@@ -114,13 +114,22 @@
                     #{listItem}
                 </foreach>
             </if>
-            <if test="nextDate != null and nextDate.size() >= 2">
+            <if test="nextDate != null and nextDate.size() >= 2 and (order == null or order == '' or (sort != 'nextInCheckDate' and sort != 'nextOutCheckDate' and sort != 'nextPressureCheckDate'))">
                 AND (
                 (eb.NEXT_IN_CHECK_DATE BETWEEN #{nextDate[0]} AND #{nextDate[1]})
                 OR (eb.NEXT_OUT_CHECK_DATE BETWEEN #{nextDate[0]} AND #{nextDate[1]})
                 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 != ''">
+                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 != ''">
+                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 != ''">
+                AND eb.NEXT_PRESSURE_CHECK_DATE BETWEEN #{nextDate[0]} AND #{nextDate[1]}
+            </if>
             <if test="typeList != null and typeList.size() > 0">
                 AND eb.type IN
                 <foreach close=")" collection="typeList" item="listItem" open="(" separator=",">
@@ -234,13 +243,22 @@
                     #{listItem}
                 </foreach>
             </if>
-            <if test="nextDate != null and nextDate.size() >= 2">
+            <if test="nextDate != null and nextDate.size() >= 2 and (order == null or order == '' or (sort != 'nextInCheckDate' and sort != 'nextOutCheckDate' and sort != 'nextPressureCheckDate'))">
                 AND (
                 (eb.NEXT_IN_CHECK_DATE BETWEEN #{nextDate[0]} AND #{nextDate[1]})
                 OR (eb.NEXT_OUT_CHECK_DATE BETWEEN #{nextDate[0]} AND #{nextDate[1]})
                 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 != ''">
+                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 != ''">
+                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 != ''">
+                AND eb.NEXT_PRESSURE_CHECK_DATE BETWEEN #{nextDate[0]} AND #{nextDate[1]}
+            </if>
             <if test="typeList != null and typeList.size() > 0">
                 AND eb.type IN
                 <foreach close=")" collection="typeList" item="listItem" open="(" separator=",">