Pārlūkot izejas kodu

获取作业票详细信息补充lockId字段

Frankensteinly 11 mēneši atpakaļ
vecāks
revīzija
f6e987ce4d

+ 2 - 1
ktg-iscs/src/main/java/com/ktg/iscs/domain/vo/points/PointDetailVO.java

@@ -80,5 +80,6 @@ public class PointDetailVO extends BaseBean
     @ApiModelProperty(value = "锁具类型图片")
     private String lockTypeImg;
 
-
+    @ApiModelProperty(value = "挂锁ID")
+    private Long lockId;
 }

+ 5 - 0
ktg-iscs/src/main/java/com/ktg/iscs/service/impl/IsJobTicketServiceImpl.java

@@ -79,6 +79,11 @@ public class IsJobTicketServiceImpl extends ServiceImpl<IsJobTicketMapper, IsJob
         if (!isJobTicketPoints.isEmpty()) {
             List<Long> pointIds = isJobTicketPoints.stream().map(IsJobTicketPoints::getPointId).collect(Collectors.toList());
             List<PointDetailVO> pointDetailList = iIsIsolationPointService.getPointDetailList(pointIds);
+            pointDetailList.forEach(o ->
+                    isJobTicketPoints.stream()
+                            .filter(o1 -> o1.getPointId().equals(o.getPointId()))
+                            .findFirst()
+                            .ifPresent(data -> o.setLockId(data.getLockId())));
             // 2.2组装隔离点数据
             jobTicketDetailVO.setPointDetailVOList(pointDetailList);
         }