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

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

@@ -384,7 +384,7 @@
         on RCON.CONSIGNEE_ID = ASO.RECEIVE_ID
         left join RMS_SUPPLIER RS
         on RS.SUPPLIER_ID = ASO.SHIPPER_ID
-        join TMSTRUCK_LOAD_RESULT TLR
+        left join TMSTRUCK_LOAD_RESULT TLR
         on TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         and TLR.MATERIAL_ID = TWR.MATERIAL_ID
         left join RMS_WAREHOUSE RW
@@ -393,17 +393,17 @@
         on TWR.RESULT_GROSS_PLACE_ID = RTCMAO.TRUCK_CALCULATE_ID
         left join RMS_TRUCK_CALCULATE RTCPI
         on TWR.RESULT_TARE_PLACE_ID = RTCPI.TRUCK_CALCULATE_ID
-        join TMSTRUCK_ENFACTORY_RESULT TER
+        left join TMSTRUCK_ENFACTORY_RESULT TER
         on TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         left join RMS_GATEPOST RGEN
         on RGEN.GATEPOST_ID = TER.GATEPOST_ID
-        join TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+        left join TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
         on TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
         left join RMS_GATEPOST RGOUT
         on RGOUT.GATEPOST_ID = TLFR.GATEPOST_ID
-        join RMS_CAPACITY RC
+        left join RMS_CAPACITY RC
         on RC.CAPACITY_ID = OO.CAPACITY_ID
-        join RMS_MATERIAL RM
+        left join RMS_MATERIAL RM
         on RM.MATERIAL_ID = TWR.MATERIAL_ID
         left join TMSTRUCK_ARRIVAL_RESULT TAR
         on TAR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
@@ -411,6 +411,7 @@
         on TTR.RESULT_TOTAL_ID = TRR.RESULT_TOTAL_ID
         WHERE OO.ORDER_TYPE = #{orderTypee}
         AND ASO.SHIPPER_ID = #{shipperId}
+        AND OO.ORDER_STATUS IN (2,5)
         <if test="carrierSsoId != null">
             and RC2.CARRIER_SSO_ID = #{carrierSsoId}
         </if>
@@ -418,11 +419,11 @@
             and RCON.CONSIGNEE_COMPANY_NAME like #{receivName}
         </if>
         <if test="oneDate != null">
-            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TWR.RESULT_GROSS_WEIGHT_TIME
+            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TER.RESULT_ENTRY_GATE_TIME
         </if>
         <if test="startDate != null">
-            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TWR.RESULT_GROSS_WEIGHT_TIME
-            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TWR.RESULT_GROSS_WEIGHT_TIME
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TER.RESULT_ENTRY_GATE_TIME
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TER.RESULT_ENTRY_GATE_TIME
         </if>
         )
         <where>