From 44858471387cb6808fb086813d5987daf9e5d77a Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期五, 13 九月 2024 14:05:16 +0800 Subject: [PATCH] 运行监控增加省厅条件、点位在线取point online,统计增加数据权限 --- ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 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 edc2c11..a946f0c 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 @@ -26,6 +26,7 @@ import com.ycl.platform.wvp.WVPResult; import com.ycl.system.Result; import com.ycl.system.domain.SysConfig; +import com.ycl.system.entity.SysDictData; import com.ycl.system.mapper.SysConfigMapper; import com.ycl.system.mapper.SysDictDataMapper; import com.ycl.system.model.LoginUser; @@ -55,11 +56,6 @@ import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; -import javax.imageio.ImageIO; -import javax.swing.*; -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.IOException; import java.time.LocalDateTime; import java.time.ZoneId; import java.util.*; @@ -782,4 +778,19 @@ } return Result.ok().data(process); } + + @Override + public Result detailByNo(String workOrderNo) { + WorkOrderDetailVO workOrder = baseMapper.detailByNo(workOrderNo); + // 鏄惁鎶ュ + boolean hasReport = new LambdaQueryChainWrapper<>(reportMapper) + .eq(Report::getSerialNumber, workOrder.getSerialNumber()) + .exists(); + workOrder.setHasReport(hasReport); + // 鏁呴殰绫诲瀷 + List<SysDictData> errorList = workOrderErrorTypeService.getBaseMapper().getErrorList(workOrder.getWorkOrderNo()); + List<String> errList = errorList.stream().map(SysDictData::getDictLabel).collect(Collectors.toList()); + workOrder.setErrorTypeList(errList); + return Result.ok().data(workOrder); + } } -- Gitblit v1.8.0