From f8889f7364adae89e45a5ec3fcf4b38e430cf389 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 10 九月 2024 10:41:18 +0800
Subject: [PATCH] 工单详情
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 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 6d34d35..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.*;
@@ -101,7 +97,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public Boolean innerAddWorkOrder(List<WorkOrder> workOrderList) {
+ public synchronized Boolean innerAddWorkOrder(List<WorkOrder> workOrderList) {
int total = workOrderList.size();
workOrderList.stream().filter(item -> {
return StringUtils.hasText(item.getSerialNumber()) && Objects.nonNull(item.getStatus()) && !CollectionUtils.isEmpty(item.getErrorTypeList());
@@ -763,19 +759,38 @@
Date now = new Date();
if (Objects.nonNull(beforeRecord)) {
- if (beforeRecord.getStartCreateTime().after(now)) {
+ if (now.before(beforeRecord.getBeginCreateTime())) {
process.setBeforeReportMsg("浜嬪墠鎶ュ宸插け鏁�");
- } else if (beforeRecord.getEndCreateTime().before(now)){
+ } else if (now.after(beforeRecord.getEndCreateTime())){
process.setBeforeReportMsg("浜嬪墠鎶ュ鏈敓鏁�");
+ } else {
+ process.setBeforeReportMsg("宸蹭簨鍓嶆姤澶�");
}
}
if (Objects.nonNull(afterRecord)) {
- if (afterRecord.getStartCreateTime().after(now)) {
+ if (now.before(afterRecord.getBeginCreateTime())) {
process.setAfterReportMsg("浜嬪悗鎶ュ宸插け鏁�");
- } else if (afterRecord.getEndCreateTime().before(now)){
+ } else if (now.after(afterRecord.getEndCreateTime())){
process.setAfterReportMsg("浜嬪悗鎶ュ鏈敓鏁�");
+ } else {
+ process.setAfterReportMsg("宸蹭簨鍚庢姤澶�");
}
}
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