yangdamao 1 år sedan
förälder
incheckning
8539af650c

+ 18 - 19
zhongzheng-system/src/main/resources/mapper/modules/order/OrderHandleMapper.xml

@@ -63,31 +63,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="payStatus != null and payStatus != ''">
             AND oh.pay_status = #{payStatus}
         </if>)u
+        LEFT JOIN course_education_type cet ON u.education_type_id = cet.id
+        LEFT JOIN course_project_type cpt ON u.project_id = cpt.id
+        LEFT JOIN course_business cb ON u.business_id = cb.id
+        where 1=1
         <if test="invoiceStatus != null and invoiceStatus != ''">
-         LEFT JOIN
-            (SELECT
-            oi.*
+        AND
+          (SELECT
+            COUNT(oi.invoice_id)
             FROM
             order_invoice_order oio
             LEFT JOIN order_invoice oi ON oio.invoice_id = oi.invoice_id
             WHERE
             oio.order_sn = u.handle_order_sn
-            ORDER BY
-            oi.create_time DESC
-            LIMIT 1) o
-        </if>
-        LEFT JOIN course_education_type cet ON u.education_type_id = cet.id
-        LEFT JOIN course_project_type cpt ON u.project_id = cpt.id
-        LEFT JOIN course_business cb ON u.business_id = cb.id
-        where 1=1
-        <if test="invoiceStatus != null and invoiceStatus == 1">
-            AND o.period_status = 1
-        </if>
-        <if test="invoiceStatus != null and invoiceStatus == 2">
-            AND o.invoice_status = 2
-        </if>
-        <if test="invoiceStatus != null and invoiceStatus == 3">
-            AND o.period_status = 2
+            <if test="invoiceStatus != null and invoiceStatus == 1">
+                AND oi.period_status = 1
+            </if>
+            <if test="invoiceStatus != null and invoiceStatus == 2">
+                AND oi.invoice_status = 2
+            </if>
+            <if test="invoiceStatus != null and invoiceStatus == 3">
+                AND oi.period_status = 2
+            </if>
+            AND (oi.wash_status is null or oi.wash_status = 1)
+           ) > 0
         </if>
         ORDER BY u.create_time DESC
     </select>