From 199c006340b54014d3a38b4ad14999f864329474 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 17 九月 2024 18:57:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
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..4d94f52 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;
@@ -402,7 +400,7 @@
List<WorkOrderYwConditionRecordVO> ywConditionList = workOrderYwConditionRecordMapper.selectYwConditionByYwId(workOrderNo);
ywConditionList.stream().forEach(item -> {
if (Objects.nonNull(item.getSysMsg()) && item.getSysMsg()) {
- item.setCommitUserName("绯荤粺娑堟伅");
+ item.setUnitName("绯荤粺娑堟伅");
}
});
return ywConditionList;
@@ -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