修改

pom.xml

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

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

@@ -1396,7 +1396,7 @@ public class StatisticalReportController extends BaseRESTfulController {
         if(report.size() > 0 && report.get(0) != null && preMap != null ) {
             report.get(0).putAll(preMap);
         }
-        PageListAdd pageList = columnDataUtil.tableColumnData5(apiId, null, report);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, report);
         return success(pageList);
     }
 }

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

@@ -5566,6 +5566,7 @@
         TLR.RESULT_ID "resultId",
         TLR.MATERIAL_ID "materialId",
         OO.ORDER_ID "orderId",
+        ASOM.SALE_DATE_OF_RECEIPT "orderDate",
         CASE
         WHEN TER.RESULT_ENTRY_GATE_TIME IS NULL
         THEN '未进厂'
@@ -5655,6 +5656,13 @@
             and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') <= TER.RESULT_ENTRY_GATE_TIME
             and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= TER.RESULT_ENTRY_GATE_TIME
         </if>
+        <if test="oneDate != null and isOrderDate == 1">
+            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= ASOM.SALE_DATE_OF_RECEIPT
+        </if>
+        <if test="startDate != null and isOrderDate == 1">
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= ASOM.SALE_DATE_OF_RECEIPT
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= ASOM.SALE_DATE_OF_RECEIPT
+        </if>
         )
         <where>
             <if test="capacityNumber != null and capacityNumber != ''">