From 8b53c881c10eadbaa6ad20cae28f8187a1dcbd32 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <583671871@qq.com>
Date: Wed, 25 Dec 2024 10:07:08 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E9=85=8D=E9=80=81=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1 优化配送明细广播推送
---
 ...ExpenseDispatchTrainDetailServiceImpl.java | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/ExpenseDispatchTrainDetailServiceImpl.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/ExpenseDispatchTrainDetailServiceImpl.java
index 0c5f8072b..0279c0531 100644
--- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/ExpenseDispatchTrainDetailServiceImpl.java
+++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/ExpenseDispatchTrainDetailServiceImpl.java
@@ -41,6 +41,8 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -64,9 +66,28 @@ public class ExpenseDispatchTrainDetailServiceImpl extends BaseServiceImpl<Expen
 		IPage<ExpenseDispatchTrainDetailVO> page = Condition.getPage(query);
 		// 增加仓库权限
 		buildWarehouseAuth(query);
+		// 处理时间
+		buildDate(query);
 		return page.setRecords(baseMapper.selectExpenseDispatchTrainDetailPage(page, query));
 	}
 
+	private void buildDate(ExpenseDispatchTrainDetailQuery query) {
+		String deliveryDateStart = query.getDeliveryDateStart();
+		if (StrUtil.isNotEmpty(deliveryDateStart)) {
+			DateTimeFormatter inputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+			DateTimeFormatter outputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+			LocalDateTime dateTime = LocalDateTime.parse(deliveryDateStart, inputFormatter);
+			query.setDeliveryDateStart(dateTime.format(outputFormatter));
+		}
+		String deliveryDateEnd = query.getDeliveryDateEnd();
+		if (StrUtil.isNotEmpty(deliveryDateEnd)) {
+			DateTimeFormatter inputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+			DateTimeFormatter outputFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+			LocalDateTime dateTime = LocalDateTime.parse(deliveryDateEnd, inputFormatter);
+			query.setDeliveryDateEnd(dateTime.format(outputFormatter));
+		}
+	}
+
 	private void buildWarehouseAuth(ExpenseDispatchTrainDetailQuery query) {
 		if (StrUtil.isEmpty(query.getDestinationWarehouse())) {
 			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
@@ -129,6 +150,7 @@ public class ExpenseDispatchTrainDetailServiceImpl extends BaseServiceImpl<Expen
 		page.setSize(-1);
 		page.setCurrent(1);
 		buildWarehouseAuth(query);
+		buildDate(query);
 		List<ExpenseDispatchTrainDetailVO> list = baseMapper.selectExpenseDispatchTrainDetailPage(page, query);
 		ExcelUtil.export(response, list, ExpenseDispatchTrainDetailVO.class);