From 6f81853b31d3fc844dc348cdcd71ae985aa8dab0 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Wed, 19 Mar 2025 14:20:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=E5=BC=80=E5=8D=95=E6=94=B6=E5=85=A5=20?=
 =?UTF-8?q?=E6=80=BB=E8=AE=A1=E9=9C=80=E8=A6=81=E6=8C=89=E5=B9=B4=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml
index fbd050e85..49f8a3788 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml
@@ -23,7 +23,7 @@
     <select id="findTotalFee" resultType="java.math.BigDecimal">
         select IFNULL(sum(IFNULL(x_pay,0)+IFNULL(d_pay,0)+IFNULL(y_pay,0)+IFNULL(h_pay,0)),0)
         from logpm_warehouse_waybill
-        where 1=1
+        where 1=1 and YEAR(create_time) = YEAR(CURDATE())
         and destination_warehouse_id = #{warehouseId}
 
     </select>

From bb4ad624f2be54d8dfbc00e508a189924851ef56 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Wed, 19 Mar 2025 14:24:58 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=E5=B9=B2=E7=BA=BF=E8=BD=A6=E6=AC=A1?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/logpm/report/mapper/WarehouseIndexMapper.xml     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml
index 49f8a3788..c99d6ca97 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/WarehouseIndexMapper.xml
@@ -1023,6 +1023,7 @@
         logpm_trunkline_cars_load ltcl LEFT JOIN
         logpm_trunkline_cars_load_line ltcll on ltcll.load_id=ltcl.id
         WHERE
+        YEAR(ltcl.create_time) = YEAR(CURDATE()) and
         ltcl.load_status!=100 and ltcll.node_id =#{warehouseId}
     </select>
     <select id="findCarsStattisonTheWayNum" resultType="java.lang.Integer">
@@ -1032,6 +1033,7 @@
         logpm_trunkline_cars_load ltcl LEFT JOIN
         logpm_trunkline_cars_load_line ltcll on ltcll.load_id=ltcl.id
         WHERE
+        YEAR(ltcl.create_time) = YEAR(CURDATE()) and
         ltcl.load_status!=100 and ltcll.node_status='0' and ltcll.node_id =#{warehouseId}
     </select>
     <select id="findCarsStattisWorkingNum" resultType="java.lang.Integer">
@@ -1041,6 +1043,7 @@
         logpm_trunkline_cars_load ltcl LEFT JOIN
         logpm_trunkline_cars_load_line ltcll on ltcll.load_id=ltcl.id
         WHERE
+        YEAR(ltcl.create_time) = YEAR(CURDATE()) and
         ltcl.load_status!='100' and ltcl.load_status!='100' and ltcll.node_status='10' and ltcll.unload_status='0' and ltcll.node_id =#{warehouseId}
 
     </select>
@@ -1051,6 +1054,7 @@
         logpm_trunkline_cars_load ltcl LEFT JOIN
         logpm_trunkline_cars_load_line ltcll on ltcll.load_id=ltcl.id
         WHERE
+        YEAR(ltcl.create_time) = YEAR(CURDATE()) and
         ltcl.load_status!='100' and ltcl.load_status!='100' and ltcll.node_status='10' and ltcll.unload_status!='0' and ltcll.node_id =#{warehouseId}
 
     </select>