~zhoushihao/YiWuProject.git

			@@ -28,10 +28,7 @@
			import org.springframework.stereotype.Service;

			import javax.annotation.Resource;
			import java.util.ArrayList;
			import java.util.HashMap;
			import java.util.List;
			import java.util.Map;
			import java.util.*;
			import java.util.stream.Collectors;

			/**
			@@ -329,7 +326,7 @@
			}

			@Override
			public Map<String, FlowCardGlassInfoDTO> queryHollowAllFlowCardSummary(HollowBigStorageDetailsQueryVO query) {
			public List<FlowCardGlassInfoDTO> queryHollowAllFlowCardSummary(HollowBigStorageDetailsQueryVO query) {
			List<HollowBigStorageCageDetails> detailsList = hollowBigStorageCageDetailsService.list(new LambdaQueryWrapper<HollowBigStorageCageDetails>()
			.eq(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN)
			.like(StringUtils.isNotBlank(query.getFilmsId()), HollowBigStorageCageDetails::getFilmsId, query.getFilmsId())
			@@ -339,7 +336,7 @@
			);
			if (CollectionUtil.isEmpty(detailsList)) {
			log.info("笼内无玻璃");
			return new HashMap<>();
			return null;
			}
			Map<String, List<HollowBigStorageCageDetails>> listMap = detailsList.stream().collect(Collectors.groupingBy(HollowBigStorageCageDetails::getFlowCardId));
			List<FlowCardGlassInfoDTO> dtos = new ArrayList<>();
			@@ -367,7 +364,12 @@
			return dto1; // 返回合并后的对象
			}
			));
			return result;
			List<FlowCardGlassInfoDTO> resultList = new ArrayList<>(result.values());
			List<FlowCardGlassInfoDTO> sortedList = resultList.stream()
			.sorted(Comparator.comparing(FlowCardGlassInfoDTO::getRealCount).reversed() // 第一个字段倒序
			.thenComparing(FlowCardGlassInfoDTO::getSumCount, Comparator.reverseOrder())) // 第二个字段倒序
			.collect(Collectors.toList());
			return sortedList;
			}

			@Override