daas

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

@@ -544,12 +544,18 @@ public class StatisticalReportController extends BaseRESTfulController {
                                                     Integer pageSize,
                                                     String startTime,
                                                     String endTime,
-                                                    String con
+                                                    String con,
+                                                    String isPage
     ){
         if (con != null && !"undefined".equals(con)) {
             mapValue.put("con",con);
         }
+
         DataChange.queryDataByDateTime(startTime, endTime, mapValue,sdfDateTime);//根据时间段查询数据
+        if(isPage != null && !"".equals(isPage)){
+            List<Map<String, Object>> report = statisticalReportService.getLoaderForResultDetail(mapValue);
+            return success(report);
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> report = statisticalReportService.getLoaderForResultDetail(mapValue);

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

@@ -1715,7 +1715,7 @@
         LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
         ON TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
         <where>
-        OO.ORDER_TYPE IN (6,7) and  TWR.RESULT_NET_WEIGHT IS NOT NULL and RL.LINE_ID IN (129988,129989,129991,129992,89992)
+        OO.ORDER_TYPE IN (6,7) and  TWR.RESULT_NET_WEIGHT IS NOT NULL and RL.LINE_ID IN (129988,129989,129991,129992,89992,169984)
         <if test="orgCode!=null">
         AND   OO.OPTIONER_CODE=#{orgCode}
         </if>