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

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

@@ -47,7 +47,6 @@
                     left join RMS_GATEPOST RG on TLFR2.GATEPOST_ID = RG.GATEPOST_ID
                     where TLFR2.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
                     )"outGatepostName",
-
                      RTCMAO.TRUCK_CALCULATE_NUMBER  "grossCalculateNum",
                      RTCPI.TRUCK_CALCULATE_NUMBER   "tareCalculateNum",
                      TWR.RESULT_GROSS_WEIGHT_TIME   "resultGrossWeightTime",
@@ -62,7 +61,6 @@
                                  on TTR.ORDER_ID = OO.ORDER_ID
                        left join RMS_CAPACITY RC
                                  on RC.CAPACITY_ID = OO.CAPACITY_ID
-
                        left join OMSTRUCK_ORDER_MATERIAL OOM
                                  on OOM.ORDER_ID = OO.ORDER_ID
                        left join RMS_MATERIAL RM
@@ -163,7 +161,9 @@
                 </foreach>
             </if>
         </where>
-        <include refid="orderBy"></include>
+        <include refid="orderBy">
+
+        </include>
         <if test="orderField == null">
             order by "insertTimee" desc
         </if>
@@ -196,12 +196,14 @@
         APO.PURCHASE_ORDER_NO      "purchaseOrderNo",
         RS.SUPPLIER_NAME           "supplierName",
         RCON.CONSIGNEE_COMPANY_NAME "receiveName",
-        TWR.RESULT_TARE_WEIGHT_TIME    "resultTareWeightTime"
+        TWR.RESULT_TARE_WEIGHT_TIME    "resultTareWeightTime",
+        RL.LINE_NAME                "lineName"
         from OMSTRUCK_ORDER OO
         left join TMSTRUCK_TOTAL_RESULT TTR
         on TTR.ORDER_ID = OO.ORDER_ID
         left join RMS_CAPACITY RC
         on RC.CAPACITY_ID = OO.CAPACITY_ID
+        left join RMS_LINE RL on OO.LINE_ID = RL.LINE_ID
         left join TMSTRUCK_ENFACTORY_RESULT TER
         on TTR.RESULT_TOTAL_ID = TER.RESULT_TOTAL_ID
         left join RMS_GATEPOST RGEN      --进厂门岗
@@ -1179,7 +1181,9 @@
                 </foreach>
             </if>
         </where>
-        <include refid="orderBy"></include>
+        <if test="orderField != null and orderField != ''">
+            order by "resultTareWeightTime"
+        </if>
     </select>
 
     <select id="getLoading" parameterType="map" resultType="java.util.Map">