Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-TMS-TRUCK-API

src/main/resources/com/steerinfo/dil/mapper/StatisticalReportMapper.xml

@@ -2607,6 +2607,12 @@
         <if test="consigneeLoginName != null">
             and RC.CONSIGNEE_COMPANY_NAME LIKE '%${consigneeLoginName}%'
         </if>
+        <if test="paymentCustomer != null">
+            and
+            <foreach collection="paymentCustomer" item="item" open="(" separator="or" close=")">
+                ASO.SALE_ORDER_RECEIVE_CUSTOMER  like '%${item}%'
+            </foreach>
+        </if>
         order by ASO.SALE_ORDER_ID DESC, ASOM.SALE_ORDER_MATERIAL_ID DESC,OO.ORDER_ID  DESC
         )
     </select>
@@ -2786,6 +2792,7 @@
         and (aso.DELETED between 1 and 2 and aso.SALE_ORDER_STATUS = 4 or aso.DELETED = 0 and aso.SALE_ORDER_STATUS between 0 and 4)
         and ASM.SALE_MATERIAL_ID IS NOT NULL
         and BDO.WETHER_TO_STATEMENT = 1
+        and BDO.STATEMENT_ID IS NULL
         <if test="oneDate != null">
             and to_date(#{oneDate}, 'yyyy-mm-dd') &lt; = to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd'),'yyyy-mm-dd')
         </if>
@@ -2915,6 +2922,12 @@
                 '${item}'
             </foreach>
         </if>
+        <if test="paymentCustomer != null">
+            and
+            <foreach collection="paymentCustomer" item="item" open="(" separator="or" close=")">
+                   ASO.SALE_ORDER_RECEIVE_CUSTOMER  like '%${item}%'
+            </foreach>
+        </if>
         <if test="consigneeLoginName != null">
             and RC.CONSIGNEE_COMPANY_NAME LIKE '%${consigneeLoginName}%'
         </if>