Explorar o código

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

luobang %!s(int64=2) %!d(string=hai) anos
pai
achega
f8a95fb0a7

+ 0 - 2
src/main/resources/com/steerinfo/dil/mapper/StatisticalReportMapper.xml

@@ -4043,7 +4043,6 @@
         ) OO_EN ON OO_EN .ORDER_ID = OO .ORDER_ID
         WHERE
         ASO .DELETED=0
-        AND OO.ORDER_TYPE = 1
         AND ASO.SALE_ORDER_ISSELF_MENTION='否'
         and #{startTime} <=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd hh24:mi:ss'),'yyyy-mm-dd hh24:mi:ss')
         and #{endTime} >=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd hh24:mi:ss'),'yyyy-mm-dd hh24:mi:ss')
@@ -4173,7 +4172,6 @@
         ) OO_EN ON OO_EN .ORDER_ID = OO .ORDER_ID
         WHERE
         ASO .DELETED=0
-        AND OO.ORDER_TYPE = 1
         AND ASO.SALE_ORDER_ISSELF_MENTION='是'
         and #{startTime} <=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd hh24:mi:ss'),'yyyy-mm-dd hh24:mi:ss')
         and #{endTime} >=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT-1,'yyyy-mm-dd hh24:mi:ss'),'yyyy-mm-dd hh24:mi:ss')