Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun

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

@@ -21,7 +21,7 @@
                 AND collection_ing_payable-collection_ed_payable=0
             </if>
         </if>
-        <if test="contractNo != null and contractNo != ''">
+        <if test="contractNo != null and contractNo != ''and contractNo != '全部合同'">
             AND contract_no = #{contractNo}
         </if>
         <if test="businessKeys != null and businessKeys.size > 0">
@@ -84,7 +84,7 @@
                 AND collection_ing_payable-collection_ed_payable=0
             </if>
         </if>
-        <if test="contractNo != null and contractNo != ''">
+        <if test="contractNo != null and contractNo != ''and contractNo != '全部合同'">
             AND contract_no = #{contractNo}
         </if>
         <if test="businessKeys != null and businessKeys.size > 0">

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

@@ -19,7 +19,7 @@
                 AND amount_ing_payable-amount_ed_payable=0
             </if>
         </if>
-        <if test="contractNo != null and contractNo != ''">
+        <if test="contractNo != null and contractNo != ''and contractNo != '全部合同'">
             AND contract_no = #{contractNo}
         </if>
         <if test="businessKeys != null and businessKeys.size > 0">
@@ -85,7 +85,7 @@
         WHERE
         comp_id = #{compId}
         and delete_flag = '0'
-        <if test="contractNo != null and contractNo != ''">
+        <if test="contractNo != null and contractNo != ''and contractNo != '全部合同'">
             AND contract_no = #{contractNo}
         </if>
         <if test="searchType != null and searchType != ''">

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

@@ -19,7 +19,7 @@
                 AND collection_ing_payable-collection_ed_payable=0
             </if>
         </if>
-        <if test="contractNo != null and contractNo != ''">
+        <if test="contractNo != null and contractNo != ''and contractNo != '全部合同'">
             AND contract_no = #{contractNo}
         </if>
         <if test="businessKeys != null and businessKeys.size > 0">
@@ -82,7 +82,7 @@
                 AND collection_ing_payable-collection_ed_payable=0
             </if>
         </if>
-        <if test="contractNo != null and contractNo != ''">
+        <if test="contractNo != null and contractNo != ''and contractNo != '全部合同'">
             AND contract_no = #{contractNo}
         </if>
         <if test="businessKeys != null and businessKeys.size > 0">

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

@@ -17,7 +17,7 @@
                 AND collection_ing_payable-collection_ed_payable=0
             </if>
         </if>
-        <if test="contractNo != null and contractNo != ''">
+        <if test="contractNo != null and contractNo != ''and contractNo != '全部合同'">
             AND contract_no = #{contractNo}
         </if>
         <if test="businessKeys != null and businessKeys.size > 0">
@@ -83,7 +83,7 @@
                 AND collection_ing_payable-collection_ed_payable=0
             </if>
         </if>
-        <if test="contractNo != null and contractNo != ''">
+        <if test="contractNo != null and contractNo != ''and contractNo != '全部合同'">
             AND contract_no = #{contractNo}
         </if>
         <if test="businessKeys != null and businessKeys.size > 0">