麻柳新厂厂外库功能

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

@@ -6831,17 +6831,18 @@
                 AND ASO.business_type IS NULL
             </otherwise>
         </choose>
-        <if test="oneDate != null and orderNoFlag == null and dateType != 2">
+        <!--and orderNoFlag == null -->
+        <if test="oneDate != null and dateType != 2">
             and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT,'yyyy-mm-dd hh24:mi:ss'),'yyyy-mm-dd hh24:mi:ss')
         </if>
-        <if test="startDate != null and orderNoFlag == null and dateType != 2">
+        <if test="startDate != null and dateType != 2">
             and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT,'yyyy-mm-dd hh24:mi:ss'),'yyyy-mm-dd hh24:mi:ss')
             and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT,'yyyy-mm-dd hh24:mi:ss'),'yyyy-mm-dd hh24:mi:ss')
         </if>
-        <if test="oneDate != null and orderNoFlag == null and dateType != null and dateType == 2">
+        <if test="oneDate != null and dateType != null and dateType == 2">
             and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = to_date(to_char(ASM.SALE_MAKE_DATE,'yyyy-mm-dd hh24:mi:ss'),'yyyy-mm-dd hh24:mi:ss')
         </if>
-        <if test="startDate != null and orderNoFlag == null and dateType != null and dateType == 2">
+        <if test="startDate != null and dateType != null and dateType == 2">
             and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  to_date(to_char(ASM.SALE_MAKE_DATE,'yyyy-mm-dd hh24:mi:ss'),'yyyy-mm-dd hh24:mi:ss')
             and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  to_date(to_char(ASM.SALE_MAKE_DATE,'yyyy-mm-dd hh24:mi:ss'),'yyyy-mm-dd hh24:mi:ss')
         </if>