修改

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.example</groupId>
     <artifactId>dil-tms-truck-api</artifactId>
-    <version>1.2</version>
+    <version>1.3</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>

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

@@ -1501,7 +1501,7 @@ public class StatisticalReportController extends BaseRESTfulController {
                                             String saler,
                                             String easPrimaryId
     ){
-        DataChange.queryDataByDateTimeYestDay(startTime, endTime, map, sdfDateTime);//根据时间段查询数据
+        DataChange.queryDataByDateTime(startTime, endTime, map, sdfDateTime);//根据时间段查询数据
         if(carrierSsoId != null){
             if(!"null".equals(carrierSsoId) && carrierSsoId != null){
                 map.put("carrierSsoId", carrierSsoId);

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

@@ -6452,7 +6452,7 @@
         SELECT * FROM (
         SELECT distinct OO.ORDER_ID "orderId",
         ASO.SALE_ORDER_ID "saleOrderId",
-        to_char(ASOM.SALE_DATE_OF_RECEIPT,'yyyy-mm-dd') "orderTime",
+        ASOM.SALE_DATE_OF_RECEIPT "orderTime",
         ASM.SALE_MAKE_DATE  "saleMakeDate",
         ASO.INSERT_UPDATE_REMARK "saleOrderInertUpdateRemark",
         ASO.SALE_NUMBER "saleOrderNo",
@@ -6814,18 +6814,18 @@
         AND ASM.DELETED IS NULL
         and ASO.SALE_TYPE = 50
         <if test="oneDate != null and orderNoFlag == null and dateType != 2">
-            and to_date(#{oneDate}, 'yyyy-mm-dd') &lt; = to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT,'yyyy-mm-dd'),'yyyy-mm-dd')
+            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT,'yyyy-mm-dd hh24:mi:ss'),'yyyy-mm-dd hh24:mi:ss')
         </if>
         <if test="startDate != null and orderNoFlag == null and dateType != 2">
-            and to_date(#{startDate}, 'yyyy-mm-dd') &lt;=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT,'yyyy-mm-dd'),'yyyy-mm-dd')
-            and to_date(#{endDate}, 'yyyy-mm-dd') >=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT,'yyyy-mm-dd'),'yyyy-mm-dd')
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT,'yyyy-mm-dd hh24:mi:ss'),'yyyy-mm-dd hh24:mi:ss')
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  to_date(to_char(ASOM.SALE_DATE_OF_RECEIPT,'yyyy-mm-dd hh24:mi:ss'),'yyyy-mm-dd hh24:mi:ss')
         </if>
         <if test="oneDate != null and orderNoFlag == null and dateType != null and dateType == 2">
-            and to_date(#{oneDate}, 'yyyy-mm-dd') &lt; = to_date(to_char(ASM.SALE_MAKE_DATE,'yyyy-mm-dd'),'yyyy-mm-dd')
+            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; = to_date(to_char(ASM.SALE_MAKE_DATE,'yyyy-mm-dd hh24:mi:ss'),'yyyy-mm-dd hh24:mi:ss')
         </if>
         <if test="startDate != null and orderNoFlag == null and dateType != null and dateType == 2">
-            and to_date(#{startDate}, 'yyyy-mm-dd') &lt;=  to_date(to_char(ASM.SALE_MAKE_DATE,'yyyy-mm-dd'),'yyyy-mm-dd')
-            and to_date(#{endDate}, 'yyyy-mm-dd') >=  to_date(to_char(ASM.SALE_MAKE_DATE,'yyyy-mm-dd'),'yyyy-mm-dd')
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;=  to_date(to_char(ASM.SALE_MAKE_DATE,'yyyy-mm-dd hh24:mi:ss'),'yyyy-mm-dd hh24:mi:ss')
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  to_date(to_char(ASM.SALE_MAKE_DATE,'yyyy-mm-dd hh24:mi:ss'),'yyyy-mm-dd hh24:mi:ss')
         </if>
         <if test="orderNoFlag == null">
             AND ASM.SALE_MAKE_DATE IS NOT NULL