From 1c703617885275090d69c697e82e61f4940c0bdc Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期二, 28 五月 2024 14:20:29 +0800
Subject: [PATCH] 380新产品,优化
---
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java
index acb02f6..7b63e34 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java
@@ -92,6 +92,18 @@
}
@Override
+ public List<BsOrderScheduling> selectBsOrderSchedulingPage(BsOrderScheduling bsOrderScheduling)
+ {
+ if(bsOrderScheduling.getDateConditions()!=null){
+ String[] conditions = bsOrderScheduling.getDateConditions();
+ bsOrderScheduling.setStartTime(conditions[0]);
+ bsOrderScheduling.setEndTime(conditions[1]);
+ }
+ return bsOrderSchedulingMapper.selectBsOrderSchedulingPage(bsOrderScheduling);
+ }
+
+
+ @Override
public FollowReportVO getFollowReportList(BsOrderScheduling bsOrderScheduling)
{
FollowReportVO vo = new FollowReportVO();
@@ -134,7 +146,7 @@
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
LocalDateTime now = LocalDateTime.now();
LocalDateTime startTime = LocalDateTime.of(now.getYear(),now.getMonthValue(),now.getDayOfMonth(),8,0,0);
- LocalDateTime endTime = LocalDateTime.of(now.getYear(),now.getMonthValue(),now.plusDays(1).getDayOfMonth(),22,0,0);
+ LocalDateTime endTime = LocalDateTime.of(now.getYear(),now.getMonthValue(),now.plusDays(1).getDayOfMonth(),23,0,0);
String s1 = startTime.format(formatter);
String s2 = endTime.format(formatter);
bsOrderScheduling.setStartTime(s1);
@@ -161,7 +173,7 @@
}
}
}
- for (int i = 8; i < 23; i++) {
+ for (int i = 8; i < 24; i++) {
if (i==8){
arr.add(0);
}else {
--
Gitblit v1.9.3