luobang 2 年之前
父节点
当前提交
a9682ad916

+ 1 - 0
src/main/java/com/steerinfo/dil/service/impl/StatisticalReportImpl.java

@@ -278,6 +278,7 @@ public class StatisticalReportImpl implements IStatisticalReportService {
             !"已关闭".equals(stringObjectMap.get("orderStatus"))) {
                 set.add(stringObjectMap.get("saleOrderMaterialId"));
             }
+            calculateDifferenceTime(stringObjectMap);
             //收货客户筛选
             Map<String, Object> filterConsigneeMap = new HashMap<>();
             filterConsigneeMap.put("text",stringObjectMap.get("consigneeName"));

+ 2 - 0
src/main/resources/com/steerinfo/dil/mapper/StatisticalReportMapper.xml

@@ -1988,6 +1988,8 @@
                     TWR.RESULT_NET_WEIGHT        "netWeight",
                     TLFR.RESULT_OUT_GATE_TIME    "outGateTime",
                     TER.RESULT_ENTRY_GATE_TIME   "entryGateTime",
+                    TER.RESULT_ENTRY_GATE_TIME   "resultEntryGateTime",
+                    TLFR.RESULT_OUT_GATE_TIME   "resultOutGateTime",
                     TAR.RESULT_ARRIVAL_ADDRESS "arrivalAddress",
                     TRR.RESULT_ARRIVAL_ADDRESS "receiptAddress",
                     ASOM.SALE_DATE_OF_RECEIPT   "saleDateReceipt",