From e6604f327adb238274dc7a1fc14892916e2d6a92 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 06 三月 2026 09:56:50 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java | 23 +----------------------
1 files changed, 1 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 2c34d74..29fecf8 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
@@ -1455,8 +1455,7 @@
.filter(i->Constants.equalsInteger(i.getType(),Constants.ZERO)).collect(Collectors.toList());
//浼樺寲鍚庢暟鎹�
List<JkSketchLine> afterList = childLineList.stream()
- .filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)
- && Constants.equalsInteger(i.getIsdeleted(),Constants.ZERO)).collect(Collectors.toList());
+ .filter(i->Constants.equalsInteger(i.getType(),Constants.ONE)&&Constants.equalsInteger(i.getIsdeleted(),Constants.ZERO)).collect(Collectors.toList());
lineNum = lineNum + (Constants.equalsInteger(jkSketch.getOptStatus(),Constants.ZERO)?beforeList.size():afterList.size());
List<TelecomLineDataVO> telecomLineDataVOList = new ArrayList<>();
@@ -1506,26 +1505,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();
--
Gitblit v1.9.3