Merge remote-tracking branch 'origin/master'

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/xml/StatisticsMapper.xml

@@ -33,7 +33,7 @@
         JOIN nm_order o ON opi.order_code = o.order_code
         JOIN nm_site s ON o.org_code = s.org_code
         WHERE opi.type NOT IN (0,3,4,6)
-        AND opi.order_status NOT IN (3,4,5,6)
+        AND opi.order_status NOT IN (0, 3, 4, 5, 6)
         AND (
         (#{type} = 1 AND DATE_ADD(opi.create_time, INTERVAL 8 HOUR) <![CDATA[ >= ]]> CURDATE() AND DATE_ADD(opi.create_time, INTERVAL 8 HOUR) <![CDATA[ < ]]> CURDATE() + INTERVAL 1 DAY) OR
         (#{type} = 2 AND DATE_ADD(opi.create_time, INTERVAL 8 HOUR) <![CDATA[ >= ]]> DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) DAY) AND DATE_ADD(opi.create_time, INTERVAL 8 HOUR) <![CDATA[ < ]]> DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) DAY) + INTERVAL 7 DAY) OR