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 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 list = baseMapper.selectExpenseDispatchTrainDetailPage(page, query); ExcelUtil.export(response, list, ExpenseDispatchTrainDetailVO.class);