From c2ca0db5572b90d3ab8ff05dd8a82a308dd8bc42 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 16 四月 2024 17:51:05 +0800
Subject: [PATCH] 工单下发：选择下发、全部下发
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 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..992da03 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
@@ -13,6 +13,8 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.platform.domain.vo.WorkOrderVO;
import com.ycl.platform.domain.query.WorkOrderQuery;
+
+import java.util.Arrays;
import java.util.List;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -22,6 +24,7 @@
import enumeration.general.FastDistributeTypeEnum;
import enumeration.general.NotifyTypeEnum;
import enumeration.general.WorkOrderStatusEnum;
+import org.apache.commons.lang3.ArrayUtils;
import org.springframework.stereotype.Service;
import org.springframework.beans.BeanUtils;
import org.springframework.transaction.annotation.Transactional;
@@ -134,9 +137,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 +205,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,
@@ -253,6 +274,17 @@
return Result.ok("鎿嶄綔鎴愬姛");
}
+ @Override
+ public Result selectedIdsDistribute(List<Integer> ids) {
+ new LambdaUpdateChainWrapper<>(baseMapper)
+ .set(WorkOrder::getStatus, WorkOrderStatusEnum.DISTRIBUTED)
+ .in(ArrayUtils.isNotEmpty(ids.toArray()), WorkOrder::getId, ids)
+ .eq(WorkOrder::getStatus, WorkOrderStatusEnum.WAIT_DISTRIBUTE)
+ // .eq(WorkOrder::getDeleted, 0)
+ .update();
+ return Result.ok("鎿嶄綔鎴愬姛");
+ }
+
/**
* 鏍规嵁id鏌ユ壘
* @param id
--
Gitblit v1.8.0