From 93c5fd918d5584f4dea767fcc20b832467c4b4f1 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 20 十一月 2025 18:02:10 +0800
Subject: [PATCH] 钥匙柜大屏
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java | 28 ++++++----------------------
1 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java
index ce12de5..cf239d5 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java
@@ -1522,26 +1522,6 @@
List<JkSketchLine> jkSketchLineList = jkSketchLineMapper.selectJoinList(JkSketchLine.class,queryWrapper);
List<TelecomCategoryDataVO> telecomCategoryDataVOList = new ArrayList<>();
- for (JkSketch jkSketch:sketchList) {
- TelecomCategoryDataVO telecomCategoryDataVO = new TelecomCategoryDataVO();
- telecomCategoryDataVO.setId(jkSketch.getCategoryId());
- telecomCategoryDataVO.setName(jkSketch.getCategoryName());
- //浼樺寲鍓嶆暟鎹�
- List<JkSketchLine> beforeList = jkSketchLineList.stream()
- .filter(i->Constants.equalsInteger(i.getSketchId(),jkSketch.getId())
- && Objects.nonNull(i.getDistance())
- &&Constants.equalsInteger(i.getType(),Constants.ZERO)).collect(Collectors.toList());
- telecomCategoryDataVO.setDistance(
- beforeList.stream().map(i->i.getDistance()).reduce(Long.valueOf(0),Long::sum)
- );
- if(Constants.equalsInteger(jkSketch.getOptStatus(),Constants.ZERO)){
- telecomCategoryDataVO.setDistanceAfter(telecomCategoryDataVO.getDistance());
- }else{
- //浼樺寲鍚庢暟鎹�
- List<JkSketchLine> afterList = jkSketchLineList.stream()
- .filter(i->Constants.equalsInteger(i.getSketchId(),jkSketch.getId())
- && Objects.nonNull(i.getDistance())
- &&Constants.equalsInteger(i.getType(),Constants.ONE)&&Constants.equalsInteger(i.getIsdeleted(),Constants.ZERO)).collect(Collectors.toList());
if(sketchList!=null){
for (JkSketch jkSketch:sketchList) {
TelecomCategoryDataVO telecomCategoryDataVO = new TelecomCategoryDataVO();
@@ -1549,7 +1529,9 @@
telecomCategoryDataVO.setName(jkSketch.getCategoryName());
//浼樺寲鍓嶆暟鎹�
List<JkSketchLine> beforeList = jkSketchLineList.stream()
- .filter(i->Constants.equalsInteger(i.getSketchId(),jkSketch.getId())&&Constants.equalsInteger(i.getType(),Constants.ZERO)).collect(Collectors.toList());
+ .filter(i->Constants.equalsInteger(i.getSketchId(),jkSketch.getId())
+ && Objects.nonNull(i.getDistance())
+ &&Constants.equalsInteger(i.getType(),Constants.ZERO)).collect(Collectors.toList());
telecomCategoryDataVO.setDistance(
beforeList.stream().map(i->i.getDistance()).reduce(Long.valueOf(0),Long::sum)
);
@@ -1558,7 +1540,9 @@
}else{
//浼樺寲鍚庢暟鎹�
List<JkSketchLine> afterList = jkSketchLineList.stream()
- .filter(i->Constants.equalsInteger(i.getSketchId(),jkSketch.getId())&&Constants.equalsInteger(i.getType(),Constants.ONE)&&Constants.equalsInteger(i.getIsdeleted(),Constants.ZERO)).collect(Collectors.toList());
+ .filter(i->Constants.equalsInteger(i.getSketchId(),jkSketch.getId())
+ && Objects.nonNull(i.getDistance())
+ &&Constants.equalsInteger(i.getType(),Constants.ONE)&&Constants.equalsInteger(i.getIsdeleted(),Constants.ZERO)).collect(Collectors.toList());
Long distanceAfter = 0L;
for (JkSketchLine jkSketchLine:afterList) {
--
Gitblit v1.9.3