修改

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/PurchaseClosingReportMapper.xml

@@ -14,9 +14,11 @@
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 2">
                 AND amount_ing_payable-amount_ed_payable>0
+                OR collection_ing_payable-collection_ed_payable>0
             </if>
             <if test="searchType == 3">
                 AND amount_ing_payable-amount_ed_payable=0
+                AND collection_ing_payable-collection_ed_payable=0
             </if>
         </if>
         <if test="contractNo != null and contractNo != ''">
@@ -75,9 +77,11 @@
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 2">
                 AND amount_ing_payable-amount_ed_payable>0
+                OR collection_ing_payable-collection_ed_payable>0
             </if>
             <if test="searchType == 3">
                 AND amount_ing_payable-amount_ed_payable=0
+                AND collection_ing_payable-collection_ed_payable=0
             </if>
         </if>
         <if test="contractNo != null and contractNo != ''">

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/SalesClosingReportMapper.xml

@@ -12,9 +12,11 @@
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 2">
                 AND amount_ing_payable-amount_ed_payable>0
+                OR collection_ing_payable-collection_ed_payable>0
             </if>
             <if test="searchType == 3">
                 AND amount_ing_payable-amount_ed_payable=0
+                AND collection_ing_payable-collection_ed_payable=0
             </if>
         </if>
         <if test="contractNo != null and contractNo != ''">
@@ -73,9 +75,11 @@
         <if test="searchType != null and searchType != ''">
             <if test="searchType == 2">
                 AND amount_ing_payable-amount_ed_payable>0
+                OR collection_ing_payable-collection_ed_payable>0
             </if>
             <if test="searchType == 3">
                 AND amount_ing_payable-amount_ed_payable=0
+                AND collection_ing_payable-collection_ed_payable=0
             </if>
         </if>
         <if test="contractNo != null and contractNo != ''">