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

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

@@ -318,13 +318,14 @@ public class StatisticalReportController extends BaseRESTfulController {
                                          String isPage,
                                           String index
     ){
-        DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);//根据时间段查询数据
+
          if (orgCode!=null&&!"null".equals(orgCode)){
              mapValue.put("orgCode",orgCode);
          }
         if (index!=null&&!"null".equals(index)){
             mapValue.put("index",index);
         }
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);//根据时间段查询数据
         if("yes".equals(isPage)){
             return success(statisticalReportService.getSaleOrderList(mapValue));
         }
@@ -355,13 +356,14 @@ public class StatisticalReportController extends BaseRESTfulController {
                                               String isPage,
                                               String index
     ){
-        DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);//根据时间段查询数据
+
         if (orgCode!=null&&!"null".equals(orgCode)){
             mapValue.put("orgCode",orgCode);
         }
         if (index!=null&&!"null".equals(index)){
             mapValue.put("index",index);
         }
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);//根据时间段查询数据
         if ("yes".equals(isPage)){
             return success(statisticalReportService.getPurchaseOrderList(mapValue));
         }
@@ -392,13 +394,14 @@ public class StatisticalReportController extends BaseRESTfulController {
                                                String isPage,
                                              String index
     ){
-        DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);//根据时间段查询数据
+
         if (index!=null&&!"null".equals(index)){
             mapValue.put("index",index);
         }
         if (orgCode!=null&&!"null".equals(orgCode)){
             mapValue.put("orgCode",orgCode);
         }
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);//根据时间段查询数据
         if ("yes".equals(isPage)){
             return  success(statisticalReportService.getPurchaseInwardList(mapValue));
         }
@@ -428,13 +431,14 @@ public class StatisticalReportController extends BaseRESTfulController {
                                        String isPage,
                                        String index
     ){
-        DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);//根据时间段查询数据
+
         if (index!=null&&!"null".equals(index)){
             mapValue.put("index",index);
         }
         if (orgCode!=null&&!"null".equals(orgCode)){
             mapValue.put("orgCode",orgCode);
         }
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);//根据时间段查询数据
         if ("yes".equals(isPage)){
             return  success(statisticalReportService.getInwardInFactory(mapValue));
         }

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

@@ -1615,8 +1615,8 @@
         ON RM.MATERIAL_ID=OOM.MATERIAL_ID
         JOIN AMS_SALE_ORDER ASO
         ON ASO.SALE_ORDER_ID=ASOM.SALE_ORDER_ID
-        LEFT JOIN AMS_SALE_ORDER_CARRIER ASOC
-        ON ASOC.SALE_ORDER_ID=ASO.SALE_ORDER_ID
+        LEFT JOIN AMS_DISPATCH_SALE_ORDER ASOC
+        ON ASOC.SALE_ORDER_MATERIAL_ID=ASOM.SALE_ORDER_MATERIAL_ID
         LEFT JOIN RMS_CARRIER RC3
         ON RC3.CARRIER_ID=ASOC.CARRIER_ID
         left join RMS_SHIPPER RS