From 2c65c31aceb16c1d06c692266e3fb555ecafdfb5 Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期三, 23 十月 2024 09:10:47 +0800
Subject: [PATCH] change-4
---
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 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 ee68208..a6534b3 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,15 @@
}
@Override
+ public List<BsOrderScheduling> selectBsOrderSchedulingListForNum() {
+ LocalDate today = LocalDate.now();
+ LocalDate localDate = today.plusDays(1);
+ String queryDate = today.toString();
+ String addQueryDate = localDate.toString();
+ return bsOrderSchedulingMapper.selectBsOrderSchedulingListForNum(queryDate,addQueryDate);
+ }
+
+ @Override
public List<BsOrderScheduling> selectBsOrderSchedulingPage(BsOrderScheduling bsOrderScheduling)
{
if(bsOrderScheduling.getDateConditions()!=null){
@@ -120,16 +129,26 @@
List<DaPassingStationCollection> collect5 = new ArrayList<>();
if (CollUtil.isNotEmpty(engineNoList)){
allChildList = daParamCollectionMapper.getListBySfcCode(engineNoList);
- collect5 = daPassingStationCollectionMapper.getListBySfcCode(engineNoList);
+ List<DaPassingStationCollection> tempCollect = daPassingStationCollectionMapper.getListBySfcCode(engineNoList);
+ if (engineNoList.size()>1){
+ List<DaPassingStationCollection> outCollect = new ArrayList<>();
+ engineNoList.forEach(engineNo -> {
+ List<DaPassingStationCollection> collect = tempCollect.stream().filter(x -> engineNo.equals(x.getSfcCode())).collect(Collectors.toList());
+ outCollect.addAll(collect);
+ });
+ collect5 = outCollect;
+ } else {
+ collect5 = tempCollect;
+ }
}
if (CollUtil.isNotEmpty(allChildList)){
//鎷垮埌鎵�鏈夊瓙鏁版嵁
List<DaParamCollection> collect1 = allChildList.stream().filter(x -> Constants.DATA1.equals(x.getType())).collect(Collectors.toList());
- List<DaParamCollection> collect2 = allChildList.stream().filter(x -> Constants.DATA2.equals(x.getType())).collect(Collectors.toList());
+// List<DaParamCollection> collect2 = allChildList.stream().filter(x -> Constants.DATA2.equals(x.getType())).collect(Collectors.toList());
List<DaParamCollection> collect3 = allChildList.stream().filter(x -> Constants.DATA3.equals(x.getType())).collect(Collectors.toList());
List<DaParamCollection> collect4 = allChildList.stream().filter(x -> Constants.DATA4.equals(x.getType())).collect(Collectors.toList());
vo.setList1(collect1);
- vo.setList2(collect2);
+// vo.setList2(collect2);
vo.setList3(collect3);
vo.setList4(collect4);
}
--
Gitblit v1.9.3