From 90cdf99a515ffe9baa6b7a0a654ad8ad9c723918 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Sat, 21 Sep 2024 10:19:42 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E7=9A=84=E5=88=A4=E6=96=AD=E8=A7=84=E5=88=99=20=E6=88=90?=
 =?UTF-8?q?=E6=9C=AC=E6=88=96=E8=80=85=E6=94=B6=E5=85=A5=E7=9A=84=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../excel/BasicdataFactoryCategoryImporter.java   |  5 +++++
 .../business/mapper/BusinessPreOrderMapper.xml    | 15 ++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataFactoryCategoryImporter.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataFactoryCategoryImporter.java
index d1961a497..0bad06bc2 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataFactoryCategoryImporter.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataFactoryCategoryImporter.java
@@ -110,6 +110,9 @@ public class BasicdataFactoryCategoryImporter implements ExcelImporter<Basicdata
 	private String buildEqualString(BasicdataFactoryCategoryEntity allBasicdataFactoryCategoryEntity) {
 		StringBuilder stringBuffer = new StringBuilder();
 		stringBuffer.append(allBasicdataFactoryCategoryEntity.getBrand()).append(allBasicdataFactoryCategoryEntity.getCategory());
+		// 增加结算类型 收入或者成本
+		stringBuffer.append(allBasicdataFactoryCategoryEntity.getType());
+
 		if (ObjectUtil.isNotEmpty(allBasicdataFactoryCategoryEntity.getFirsts())) {
 			stringBuffer.append(allBasicdataFactoryCategoryEntity.getFirsts());
 		} else {
@@ -145,6 +148,8 @@ public class BasicdataFactoryCategoryImporter implements ExcelImporter<Basicdata
 	private String buildEqualString2(BasicdataFactoryCategoryExcel datum) {
 		StringBuilder stringBuffer = new StringBuilder();
 		stringBuffer.append(datum.getBrand()).append(datum.getCategory());
+		// 增加结算类型 收入或者成本
+		stringBuffer.append(datum.getType());
 		if (ObjectUtil.isNotEmpty(datum.getFirsts())) {
 			stringBuffer.append(datum.getFirsts());
 		} else {
diff --git a/blade-service/logpm-business/src/main/java/com/logpm/business/mapper/BusinessPreOrderMapper.xml b/blade-service/logpm-business/src/main/java/com/logpm/business/mapper/BusinessPreOrderMapper.xml
index 22742a6e4..6baea708a 100644
--- a/blade-service/logpm-business/src/main/java/com/logpm/business/mapper/BusinessPreOrderMapper.xml
+++ b/blade-service/logpm-business/src/main/java/com/logpm/business/mapper/BusinessPreOrderMapper.xml
@@ -45,7 +45,8 @@
         volume,
         driver_name,
         vehicle_name,
-        in_warehouse
+        in_warehouse,
+        conditions
         FROM
         logpm_business_pre_order
         <where>
@@ -177,6 +178,18 @@
                 and order_code LIKE CONCAT(#{distributionBusinessPreOrderDTO.orderCode},'%')
             </if>
 
+            <if test="distributionBusinessPreOrderDTO.taskTimeStart != null ">
+                AND  task_time > #{distributionBusinessPreOrderDTO.taskTimeStart}
+            </if>
+            <if test="distributionBusinessPreOrderDTO.taskTimeEnd != null ">
+                AND  task_time &lt; #{distributionBusinessPreOrderDTO.taskTimeEnd}
+            </if>
+
+            <if test="distributionBusinessPreOrderDTO.driverName != null ">
+                AND  driver_name =#{distributionBusinessPreOrderDTO.driverName}
+            </if>
+
+
         </where>
         GROUP BY
         distr_car_number,