From c139302858be79aa5ca1f823c3ae3d8b1b16d6f5 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 16 四月 2024 14:48:12 +0800
Subject: [PATCH] 工单处理：过程图
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 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 b9deaa2..a9cf0ec 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
@@ -134,9 +134,27 @@
return Result.ok().data(
new LambdaQueryChainWrapper<>(workOrderYwConditionRecordMapper)
.eq(WorkOrderYwConditionRecord::getWorkOrderId, id)
- .orderByDesc(WorkOrderYwConditionRecord::getCreateTime)
+ .orderByAsc(WorkOrderYwConditionRecord::getCreateTime)
.last("limit 1")
.one());
+ }
+
+ @Override
+ public Result selectYwConditionListByYwId(String id) {
+ return Result.ok().data(
+ new LambdaQueryChainWrapper<>(workOrderYwConditionRecordMapper)
+ .eq(WorkOrderYwConditionRecord::getWorkOrderId, id)
+ .orderByAsc(WorkOrderYwConditionRecord::getCreateTime)
+ .list());
+ }
+
+ @Override
+ public Result selectYwAuditingListByYwId(String id) {
+ return Result.ok().data(
+ new LambdaQueryChainWrapper<>(workOrderAuditingRecordMapper)
+ .eq(WorkOrderAuditingRecord::getWorkOrderId, id)
+ .orderByDesc(WorkOrderAuditingRecord::getCreateTime)
+ .list());
}
@Override
@@ -184,7 +202,7 @@
public Result page(WorkOrderQuery query) {
IPage<WorkOrder> page = new LambdaQueryChainWrapper<>(baseMapper)
.eq(StringUtils.hasText(query.getWorkOrderNo()), WorkOrder::getWorkOrderNo, query.getWorkOrderNo())
- .in(WorkOrder::getStatus, WorkOrderStatusEnum.DISTRIBUTED, WorkOrderStatusEnum.YW_HANDLE)
+ .eq(StringUtils.hasText(query.getStatus().getValue()), WorkOrder::getStatus, query.getStatus())
.eq(StringUtils.hasText(query.getErrorType()), WorkOrder::getErrorType, query.getErrorType())
.between(Objects.nonNull(query.getStart()) && Objects.nonNull(query.getEnd()),
WorkOrder::getYwHandleTime,
--
Gitblit v1.8.0