1.大中型我的订单新增查询条件

dao/src/main/resources/mapper/MajorProductionMapper.xml

@@ -427,6 +427,18 @@
         <if test="vo!=null and vo.production!=null and vo.production=='ORDER'">
             AND mp.id is null
         </if>
+        <if test="vo!=null and vo.delivery == true">
+            AND mp.delivery = #{vo.delivery}
+        </if>
+        <if test="vo!=null and vo.delivery == false">
+            AND (mp.delivery = #{vo.delivery} OR mp.delivery IS NULL)
+        </if>
+        <if test="vo!=null and vo.hasRealAmount == true">
+            AND (pf.real_amount IS NOT NULL OR pf.real_amount > 0)
+        </if>
+        <if test="vo!=null and vo.hasRealAmount == false">
+            AND (pf.real_amount IS NULL OR pf.real_amount = 0)
+        </if>
         order by m.created DESC
     </sql>
 

domain/src/main/java/com/dayou/vo/MajorOrderVO.java

@@ -185,4 +185,9 @@ public class MajorOrderVO {
 
     private BigDecimal planAmount;
 
+    /**
+     * 是否收款
+     */
+    private Boolean hasRealAmount;
+
 }