From 9f1d2da92a3198be1e4925b3bafa1ba0b42a4b0f Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 05 三月 2024 20:23:50 +0800
Subject: [PATCH] 工单优化
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 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 b0ef736..26b738e 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
@@ -1,7 +1,11 @@
package com.ycl.platform.service.impl;
import com.ycl.platform.domain.entity.WorkOrder;
+import com.ycl.platform.domain.entity.YwPeople;
+import com.ycl.platform.domain.entity.YwUnit;
import com.ycl.platform.mapper.WorkOrderMapper;
+import com.ycl.platform.mapper.YwPeopleMapper;
+import com.ycl.platform.mapper.YwUnitMapper;
import com.ycl.platform.service.WorkOrderService;
import com.ycl.system.Result;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -9,7 +13,7 @@
import com.ycl.platform.domain.vo.WorkOrderVO;
import com.ycl.platform.domain.query.WorkOrderQuery;
import java.util.List;
-import org.apache.commons.lang3.StringUtils;
+
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.system.page.PageUtil;
import org.springframework.stereotype.Service;
@@ -18,10 +22,12 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import java.util.ArrayList;
+import java.util.Objects;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.RequiredArgsConstructor;
+import org.springframework.util.StringUtils;
/**
* 宸ュ崟 鏈嶅姟瀹炵幇绫�
@@ -34,6 +40,9 @@
public class WorkOrderServiceImpl extends ServiceImpl<WorkOrderMapper, WorkOrder> implements WorkOrderService {
private final WorkOrderMapper workOrderMapper;
+ private final YwUnitMapper ywUnitMapper;
+ private final YwPeopleMapper ywPeopleMapper;
+
/**
* 娣诲姞
@@ -103,12 +112,25 @@
public Result page(WorkOrderQuery query) {
IPage<WorkOrder> page = new LambdaQueryChainWrapper<>(baseMapper)
+ .eq(StringUtils.hasText(query.getWorkOrderNo()), WorkOrder::getWorkOrderNo, query.getWorkOrderNo())
+ .between(Objects.nonNull(query.getStart()) && Objects.nonNull(query.getEnd()),WorkOrder::getYwHandleTime, query.getStart(), query.getEnd())
.orderByDesc(WorkOrder::getCreateTime)
.page(PageUtil.getPage(query, WorkOrder.class));
List<WorkOrderVO> vos = page.getRecords().stream()
.map(
- entity -> WorkOrderVO.getVoByEntity(entity, null)
+ entity -> {
+ WorkOrderVO vo = WorkOrderVO.getVoByEntity(entity, null);
+ YwUnit unit = ywUnitMapper.selectById(vo.getUnitId());
+ if (Objects.nonNull(unit)) {
+ vo.setUnitName(unit.getUnitName());
+ }
+ YwPeople ywPeople = ywPeopleMapper.selectById(vo.getYwPeopleId());
+ if (Objects.nonNull(ywPeople)) {
+ vo.setYwPeopleName(ywPeople.getYwPersonName());
+ }
+ return vo;
+ }
)
.collect(Collectors.toList());
return Result.ok().data(vos).total(page.getTotal());
--
Gitblit v1.8.0