Browse Source

修改统计报表时间查询

zx 3 years ago
parent
commit
8b18689c1f

+ 4 - 3
src/main/java/com/steerinfo/dil/controller/StatisticalReportController.java

@@ -321,13 +321,13 @@ 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));
         }
@@ -358,6 +358,7 @@ 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);
         }
@@ -367,7 +368,7 @@ public class StatisticalReportController extends BaseRESTfulController {
         if ("yes".equals(isPage)){
             return success(statisticalReportService.getPurchaseOrderList(mapValue));
         }
-        DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);//根据时间段查询数据
+
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> report = statisticalReportService.getPurchaseOrderList(mapValue);
@@ -394,6 +395,7 @@ 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);
         }
@@ -403,7 +405,6 @@ public class StatisticalReportController extends BaseRESTfulController {
         if ("yes".equals(isPage)){
             return  success(statisticalReportService.getPurchaseInwardList(mapValue));
         }
-        DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);//根据时间段查询数据
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> report = statisticalReportService.getPurchaseInwardList(mapValue);