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..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 @@ -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> @@ -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>