From b6d477ad41e2a8ff9393de2beba2e735c78cf781 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 22 七月 2024 18:06:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 23 ++++++-----------------
1 files changed, 6 insertions(+), 17 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 67a558c..03e14a0 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
@@ -12,6 +12,7 @@
import com.ycl.platform.domain.query.WorkOrderQuery;
import com.ycl.platform.domain.vo.DistributeWorkOrderVO;
import com.ycl.platform.domain.vo.WorkOrderVO;
+import com.ycl.platform.domain.vo.WorkOrderYwConditionRecordVO;
import com.ycl.platform.mapper.*;
import com.ycl.platform.service.NotifyService;
import com.ycl.platform.service.WorkOrderAuditingRecordService;
@@ -76,7 +77,6 @@
entity.setWorkOrderNo(DateUtils.dateTimeNow());
entity.setCreateTime(DateUtils.getNowDate());
entity.setStatus(WorkOrderStatusEnum.WAIT_DISTRIBUTE);
- entity.setDeleted("0");
if(baseMapper.insert(entity) > 0) {
return Result.ok("娣诲姞鎴愬姛");
}
@@ -132,7 +132,7 @@
// 鏍规嵁鏁呴殰绫诲瀷鑾峰彇鍒楄〃
List<WorkOrder> list = new LambdaQueryChainWrapper<>(baseMapper)
.in(WorkOrder::getStatus, WorkOrderStatusEnum.YW_HANDLE.getValue())
- .eq(WorkOrder::getErrorType, form.getErrorType())
+ .in(WorkOrder::getErrorType, form.getErrorTypes())
.select(WorkOrder::getId, WorkOrder::getUnitId, WorkOrder::getWorkOrderNo)
.list();
if (list.isEmpty()) {
@@ -191,21 +191,9 @@
}
@Override
- public Result selectYwConditionByYwId(String id) {
- return Result.ok().data(
- new LambdaQueryChainWrapper<>(workOrderYwConditionRecordMapper)
- .eq(WorkOrderYwConditionRecord::getWorkOrderId, id)
- .orderByAsc(WorkOrderYwConditionRecord::getCreateTime)
- .list());
- }
-
- @Override
- public Result selectYwConditionListByYwId(String id) {
- return Result.ok().data(
- new LambdaQueryChainWrapper<>(workOrderYwConditionRecordMapper)
- .eq(WorkOrderYwConditionRecord::getWorkOrderId, id)
- .orderByAsc(WorkOrderYwConditionRecord::getCreateTime)
- .list());
+ public Result selectYwConditionByYwId(Integer id) {
+ List<WorkOrderYwConditionRecordVO> ywConditionList = workOrderYwConditionRecordMapper.selectYwConditionByYwId(id);
+ return Result.ok().data(ywConditionList);
}
@Override
@@ -268,6 +256,7 @@
@Override
public Result distributePage(DistributeWorkOrderQuery query) {
IPage<WorkOrderVO> page = PageUtil.getPage(query, WorkOrderVO.class);
+ // todo 鍏抽敭璇嶆悳绱�
baseMapper.distributePage(page, query);
return Result.ok().data(page).total(page.getTotal());
}
--
Gitblit v1.8.0