From 36e5600e3497d97b42376c5f096d85891f1ad94b Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 30 四月 2024 16:50:12 +0800
Subject: [PATCH] 改为连表查询
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 56 ++++++--------------------------------------------------
1 files changed, 6 insertions(+), 50 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 68d709a..abc41bd 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
@@ -130,6 +130,7 @@
}
// 宸ュ崟鐘舵��
workOrder.setStatus(WorkOrderStatusEnum.YW_HANDLE);
+ workOrder.setYwHandleTime(LocalDateTime.now());
baseMapper.updateById(workOrder);
// 娣诲姞涓�鏉¤繍缁存儏鍐佃褰�
WorkOrderYwConditionRecord workOrderYwConditionRecord = new WorkOrderYwConditionRecord();
@@ -212,60 +213,15 @@
*/
@Override
public Result page(WorkOrderQuery query) {
- IPage<WorkOrder> page = new LambdaQueryChainWrapper<>(baseMapper)
- .eq(StringUtils.hasText(query.getWorkOrderNo()), WorkOrder::getWorkOrderNo, query.getWorkOrderNo())
- .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,
- DateUtils.getDayStart(query.getStart()),
- DateUtils.getDayEnd(query.getEnd()))
- .orderByDesc(WorkOrder::getCreateTime)
- .page(PageUtil.getPage(query, WorkOrder.class));
-
- List<WorkOrderVO> vos = page.getRecords().stream()
- .map(
- 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());
+ IPage<WorkOrderVO> page = PageUtil.getPage(query, WorkOrderVO.class);
+ baseMapper.page(page, query);
+ return Result.ok().data(page.getRecords()).total(page.getTotal());
}
@Override
public Result distributePage(DistributeWorkOrderQuery query) {
- IPage<WorkOrder> page = new LambdaQueryChainWrapper<>(baseMapper)
- .eq(Objects.nonNull(query.getUnitId()), WorkOrder::getUnitId, query.getUnitId())
- .eq(WorkOrder::getStatus, WorkOrderStatusEnum.WAIT_DISTRIBUTE)
- .orderByDesc(WorkOrder::getCreateTime)
- .page(PageUtil.getPage(query, WorkOrder.class));
- List<WorkOrderVO> vos = page.getRecords().stream()
- .map(
- 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());
+ List<WorkOrderVO> page = baseMapper.distributePage(query);
+ return Result.ok().data(page).total(page.size());
}
@Override
--
Gitblit v1.8.0