Merge branch 'dev' into pre-production

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 {

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,