'销售报表'

src/main/java/com/steerinfo/dil/controller/StatisticalReportController.java

@@ -83,15 +83,15 @@ public class StatisticalReportController extends BaseRESTfulController {
                                        String carrierSsoId,
                                           Integer orderType,
                                           Integer shipperId,
-                                          String receivName
+                                          String receiveName
     ){
         if(carrierSsoId != null){
             if(!"null".equals(carrierSsoId)){
                 mapValue.put("carrierSsoId", carrierSsoId);
             }
         }
-        if (receivName != null && !"null".equals(receivName)) {
-            mapValue.put("receivName","%" + receivName + "%");
+        if (receiveName != null && !"null".equals(receiveName)) {
+            mapValue.put("receivName","%" + receiveName + "%");
         }
         mapValue.put("orderType",orderType);
         mapValue.put("shipperId",shipperId);

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

@@ -343,9 +343,6 @@
         ASO.SALE_NUMBER "saleNumber",
         TLR.CASE_NUMBER "caseNumber",
         RC2.CARRIER_NAME "carrierName",
-        TMSTRUCK_ARRIVAL_RESULT.RESULT_ARRIVAL_ADDRESS "arrivaladdress",
-        TMSTRUCK_RECEIVE_RESULT.RESULT_RECEIVE_TIME "receiveTime",
-        TMSTRUCK_TOTAL_RESULT.
         CONCAT(CONCAT(RM.MATERIAL_SPECIFICATION, '('), CONCAT(RM.MATERIAL_MODEL, ')')) "materialCode"
         from TMSTRUCK_WEIGHT_RESULT TWR
         left join TMSTRUCK_TOTAL_RESULT TTR
@@ -385,12 +382,6 @@
         on RC.CAPACITY_ID = OO.CAPACITY_ID
         join RMS_MATERIAL RM
         on RM.MATERIAL_ID = TWR.MATERIAL_ID
-
-        left join TMSTRUCK_ARRIVAL_RESULT
-        on TMSTRUCK_TOTAL_RESULT.RESULT_TOTAL_ID = TMSTRUCK_ARRIVAL_RESULT.RESULT_TOTAL_ID
-        left join TMSTRUCK_RECEIVE_RESULT
-        on TMSTRUCK_TOTAL_RESULT.RESULT_TOTAL_ID = TMSTRUCK_RECEIVE_RESULT.RESULT_TOTAL_ID
-
         WHERE OO.ORDER_TYPE = #{orderType}
         AND ASO.SHIPPER_ID = #{shipperId}
         <if test="carrierSsoId != null">