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

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

@@ -439,6 +439,13 @@
         <if test="vo!=null and vo.hasRealAmount == false">
             AND (pf.real_amount IS NULL OR pf.real_amount = 0)
         </if>
+        <if test="vo!=null and vo.hasShouldAmount == true">
+            AND (orf.should_amount IS NOT NULL OR orf.should_amount > 0 OR pf.production_should_amount IS NOT NULL OR pf.production_should_amount > 0)
+        </if>
+        <if test="vo!=null and vo.hasShouldAmount == false">
+            AND (orf.should_amount IS NULL OR orf.should_amount = 0)
+            AND (pf.production_should_amount IS NULL OR pf.production_should_amount = 0)
+        </if>
         order by m.created DESC
     </sql>
 

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

@@ -190,4 +190,9 @@ public class MajorOrderVO {
      */
     private Boolean hasRealAmount;
 
+    /**
+     * 是否有应收款
+     */
+    private Boolean hasShouldAmount;
+
 }