From a5249103ab0fb44afe898a7be309412e7cfb1906 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期二, 17 九月 2024 11:53:55 +0800 Subject: [PATCH] 工单图片在详情中展示 --- ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderDetailVO.java | 4 ++++ ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 11 ++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderDetailVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderDetailVO.java index 7e5c654..ec826de 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderDetailVO.java +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderDetailVO.java @@ -3,6 +3,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.ycl.platform.base.AbsVo; import com.ycl.platform.domain.entity.WorkOrder; +import com.ycl.platform.domain.entity.WorkOrderCheckImg; import lombok.Data; import org.springframework.beans.BeanUtils; import org.springframework.lang.NonNull; @@ -68,6 +69,9 @@ */ private Boolean hasReport; + /** 妫�娴嬪浘鐗� */ + private List<WorkOrderCheckImg> imgList; + public static WorkOrderDetailVO getVoByEntity(@NonNull WorkOrder entity, WorkOrderDetailVO vo) { if(vo == null) { vo = new WorkOrderDetailVO(); diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java index 2a8ac76..212c902 100644 --- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java +++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java @@ -73,7 +73,6 @@ @RequiredArgsConstructor public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder> implements WorkOrderService { - private final WorkOrderMapper workOrderMapper; private final YwPointService ywPointService; private final WorkOrderAuditingRecordMapper workOrderAuditingRecordMapper; private final WorkOrderAuditingRecordService workOrderAuditingRecordService; @@ -82,9 +81,8 @@ private final WorkOrderDistributeRecordMapper workOrderDistributeRecordMapper; private final WorkOrderErrorTypeServiceImpl workOrderErrorTypeService; private final SysConfigMapper configMapper; - private final ServerConfig serverConfig; private final ReportMapper reportMapper; - private final SysDictDataMapper dictDataMapper; + private final WorkOrderCheckImgMapper workOrderCheckImgMapper; @Value("${rtsp.server:http://127.0.0.1:7788}") private String rtspServer; @@ -793,6 +791,13 @@ List<SysDictData> errorList = workOrderErrorTypeService.getBaseMapper().getErrorList(workOrder.getWorkOrderNo()); List<String> errList = errorList.stream().map(SysDictData::getDictLabel).collect(Collectors.toList()); workOrder.setErrorTypeList(errList); + // 妫�娴嬪浘鐗� + List<WorkOrderCheckImg> imgList = new LambdaQueryChainWrapper<>(workOrderCheckImgMapper) + .eq(WorkOrderCheckImg::getWorkOrderNo, workOrderNo) + .orderByDesc(WorkOrderCheckImg::getCreateTime) + .last("limit 20") + .list(); + workOrder.setImgList(imgList); return Result.ok().data(workOrder); } } -- Gitblit v1.8.0