From bbc5784cc34d65e64d639d949e75b978fe07bdb3 Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期一, 06 五月 2024 12:30:48 +0800
Subject: [PATCH] 更新首页
---
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java | 4 ++--
1 files changed, 2 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 10dcfe2..acb02f6 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
@@ -140,7 +140,7 @@
bsOrderScheduling.setStartTime(s1);
bsOrderScheduling.setEndTime(s2);
List<BsOrderScheduling> todayList = bsOrderSchedulingMapper.selectBsOrderSchedulingList(bsOrderScheduling);
- todayList = todayList.stream().filter(x -> ObjectUtil.isNotEmpty(x.getCvtOfflineTime())).collect(Collectors.toList());
+ todayList = todayList.stream().filter(x -> ObjectUtil.isNotEmpty(x.getFinalAssemblyOfflineTime())).collect(Collectors.toList());
if (CollUtil.isNotEmpty(todayList)){
List<String> allModel = todayList.stream().map(BsOrderScheduling::getModel).distinct().collect(Collectors.toList());
Map<String, List<BsOrderScheduling>> collect = new HashMap<>();
@@ -149,7 +149,7 @@
List<Integer> arr = new ArrayList<>();
vo.setName(s);
collect = todayList.stream().filter(x -> s.equals(x.getModel())).collect(Collectors.groupingBy(item -> new SimpleDateFormat("yyyy-MM-dd HH").format(item
- .getCvtOfflineTime())));
+ .getFinalAssemblyOfflineTime())));
Map<Integer,Integer> temp = new HashMap<>();
if (CollUtil.isNotEmpty(collect)){
for (String string : collect.keySet()) {
--
Gitblit v1.9.3