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

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

@@ -144,29 +144,26 @@ public class StatisticalReportController extends BaseRESTfulController {
                                           String startTime,
                                           String endTime,
                                           String carrierSsoId,
-                                          String userId,
-                                           String userIds,
-                                           String con,
-                                           Integer orderType
+                                          String userId, String userIds, String con, Integer orderType
     ){
         if(carrierSsoId != null) {
             if (!"null".equals(carrierSsoId)) {
                 mapValue.put("carrierSsoId", carrierSsoId);
             }
         }
-        DataChange.queryDataByDate(startTime, endTime, mapValue, sdfDate);//根据时间段查询数据
-            if (userId!=null){
-                mapValue.put("userId",userId);
-            }
-            if (orderType!=null){
-                mapValue.put("orderType",orderType);
-            }
-            if (userIds!=null){
-                mapValue.put("userIds",userIds);
-            }
-            if (con!=null&&!con.equals("undefined")){
-                mapValue.put("con","%"+con+"%");
-            }
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
+        if (userId!=null){
+            mapValue.put("userId",userId);
+        }
+        if (orderType!=null){
+            mapValue.put("orderType",orderType);
+        }
+        if (userIds!=null){
+            mapValue.put("userIds",userIds);
+        }
+        if (con!=null&&!con.equals("undefined")){
+            mapValue.put("con","%"+con+"%");
+        }
         List<Map<String, Object>> allReport =  statisticalReportService.getSporadicSuppliesReportNum1(mapValue);
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
@@ -201,7 +198,7 @@ public class StatisticalReportController extends BaseRESTfulController {
                 mapValue.put("carrierSsoId", carrierSsoId);
             }
         }
-        DataChange.queryDataByDate(startTime, endTime, mapValue, sdfDate);//根据时间段查询数据
+        DataChange.queryDataByDateTime(startTime, endTime, mapValue, sdfDateTime);//根据时间段查询数据
         if (con!=null&&!con.equals("undefined")){
             mapValue.put("con","%"+con+"%");
         }

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

@@ -360,7 +360,6 @@
         RS.SUPPLIER_NAME            "sendName",
         RM.MATERIAL_NAME                     "materialName",
         CONCAT(CONCAT(RM.MATERIAL_SPECIFICATION, '('), CONCAT(RM.MATERIAL_MODEL, ')')) "materialCode"
-
         from OMSTRUCK_ORDER OO
         join TMSTRUCK_TOTAL_RESULT TTR
             on TTR.ORDER_ID = OO.ORDER_ID
@@ -403,11 +402,11 @@
             and RCA.CARRIER_SSO_ID = #{carrierSsoId}
         </if>
         <if test="oneDate != null">
-            and to_char(TER.RESULT_ENTRY_GATE_TIME, 'YYYY-MM-DD') = #{oneDate}
+            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TWR.RESULT_TARE_WEIGHT_TIME
         </if>
         <if test="startDate != null">
-            and to_date(#{startDate}, 'yyyy-mm-dd') &lt;= TER.RESULT_ENTRY_GATE_TIME
-            and to_date(#{endDate}, 'yyyy-mm-dd') >= TER.RESULT_ENTRY_GATE_TIME
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TWR.RESULT_TARE_WEIGHT_TIME
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TWR.RESULT_TARE_WEIGHT_TIME
         </if>
         <if test="con!=null">
             where  "receiveName" like #{con} or  "sendName" like #{con} or "materialName" like #{con}
@@ -596,11 +595,11 @@
             and RCA.CARRIER_SSO_ID = #{carrierSsoId}
         </if>
         <if test="oneDate != null">
-            and to_char(TER.RESULT_ENTRY_GATE_TIME, 'YYYY-MM-DD') = #{oneDate}
+            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TWR.RESULT_GROSS_WEIGHT_TIME
         </if>
         <if test="startDate != null">
-            and to_date(#{startDate}, 'yyyy-mm-dd') &lt;= TER.RESULT_ENTRY_GATE_TIME
-            and to_date(#{endDate}, 'yyyy-mm-dd') >= TER.RESULT_ENTRY_GATE_TIME
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= TWR.RESULT_GROSS_WEIGHT_TIME
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TWR.RESULT_GROSS_WEIGHT_TIME
         </if>
         <if test="con!=null">
             where  "receiveName" like #{con} or  "sendName" like #{con} or "materialName" like #{con}