From c139302858be79aa5ca1f823c3ae3d8b1b16d6f5 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 16 四月 2024 14:48:12 +0800
Subject: [PATCH] 工单处理：过程图
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java | 6 +-
ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java | 12 ++++++
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 22 ++++++++++-
ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java | 14 +++---
ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java | 14 +++++++
5 files changed, 56 insertions(+), 12 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java
index 7fc775b..c937a0a 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java
@@ -62,9 +62,9 @@
@TableField("yw_condition")
private String ywCondition;
- @ApiModelProperty("杩愮淮妫�娴嬬粨鏋�")
- @TableField("yw_check_result")
- private String ywCheckResult;
+ @ApiModelProperty("澶勭悊鏈熼檺")
+ @TableField("processing_period")
+ private Integer processingPeriod;
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java
index ff01f75..6a08556 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java
@@ -2,16 +2,12 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsQuery;
-
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-import org.springframework.lang.NonNull;
-import jakarta.validation.constraints.NotBlank;
+import enumeration.general.WorkOrderStatusEnum;
import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.experimental.Accessors;
+
+import java.util.Date;
/**
* 宸ュ崟鏌ヨ
@@ -46,5 +42,9 @@
*/
private String errorType;
+ /**
+ * 鐘舵��
+ */
+ private WorkOrderStatusEnum status = WorkOrderStatusEnum.DISTRIBUTED;
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java b/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
index 3ebb092..f500572 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java
@@ -63,6 +63,18 @@
return workOrderService.selectYwConditionByYwId(id);
}
+ @GetMapping("/yw-condition-list/{id}")
+ @ApiOperation(value = "杩愮淮鎯呭喌璁板綍", notes = "杩愮淮鎯呭喌璁板綍")
+ public Result ywConditionList(@PathVariable @Validated(Update.class) String id) {
+ return workOrderService.selectYwConditionListByYwId(id);
+ }
+
+ @GetMapping("/yw-auditing-list/{id}")
+ @ApiOperation(value = "杩愮淮瀹℃牳璁板綍", notes = "杩愮淮瀹℃牳璁板綍")
+ public Result ywAuditingByYwId(@PathVariable @Validated(Update.class) String id) {
+ return workOrderService.selectYwAuditingListByYwId(id);
+ }
+
@PutMapping("/yw-result")
@ApiOperation(value = "杩愮淮缁撴灉", notes = "杩愮淮缁撴灉")
public Result ywCondition(@RequestBody @Validated(Update.class) WorkOrderYWResultForm form) {
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
index de315c3..b317f2b 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/WorkOrderService.java
@@ -113,4 +113,18 @@
* @return 宸ュ崟杩愮淮鎯呭喌
*/
Result selectYwConditionByYwId(String id);
+
+ /**
+ * 鑾峰彇宸ュ崟杩愮淮鎯呭喌璁板綍
+ * @param id 宸ュ崟id
+ * @return 宸ュ崟杩愮淮鎯呭喌璁板綍
+ */
+ Result selectYwConditionListByYwId(String id);
+
+ /**
+ * 鑾峰彇宸ュ崟杩愮淮瀹℃牳璁板綍
+ * @param id 宸ュ崟id
+ * @return 宸ュ崟杩愮淮瀹℃牳璁板綍
+ */
+ Result selectYwAuditingListByYwId(String id);
}
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