From 1de0d92e2a630927f391ae080709ae678e5f5618 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期三, 17 四月 2024 15:28:46 +0800
Subject: [PATCH] 工单事后报备：新增点位id
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/WorkOrder.java | 4 ++++
ycl-pojo/src/main/java/com/ycl/platform/domain/query/DistributeWorkOrderQuery.java | 8 ++++++++
ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java | 4 ++++
ycl-server/src/main/java/com/ycl/platform/controller/WorkOrderController.java | 5 +++--
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java | 5 +++++
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 8 ++++++--
6 files changed, 30 insertions(+), 4 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 c937a0a..a1c7951 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
@@ -34,6 +34,10 @@
@TableField("error_type")
private String errorType;
+ @ApiModelProperty("鐐逛綅")
+ @TableField("point_id")
+ private Integer pointId;
+
@ApiModelProperty("宸ュ崟鏉ユ簮")
@TableField("source")
private String source;
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java
index ff2fd40..90e7327 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/WorkOrderForm.java
@@ -38,6 +38,10 @@
@ApiModelProperty("宸ュ崟鏉ユ簮")
private String source;
+ @NotNull(message = "鐐逛綅涓嶈兘涓虹┖", groups = {Add.class, Update.class})
+ @ApiModelProperty("鐐逛綅")
+ private Integer pointId;
+
@NotNull(message = "鏁呴殰绫诲瀷涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("鏁呴殰绫诲瀷")
private String errorType;
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DistributeWorkOrderQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DistributeWorkOrderQuery.java
index aa4660b..86eeeca 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DistributeWorkOrderQuery.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/DistributeWorkOrderQuery.java
@@ -1,6 +1,7 @@
package com.ycl.platform.domain.query;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
import com.ycl.platform.base.AbsQuery;
import enumeration.general.FastDistributeTypeEnum;
import io.swagger.annotations.ApiModel;
@@ -10,6 +11,7 @@
import lombok.experimental.Accessors;
import java.util.Date;
+import java.util.List;
/**
* 涓嬪彂宸ュ崟鏌ヨ
@@ -25,8 +27,14 @@
/**
* 杩愮淮鍗曚綅
*/
+ @JsonProperty("unitId")
private Integer unitId;
+ /**
+ * 宸ュ崟id
+ */
+ @JsonProperty("ids")
+ private List<Integer> ids;
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
index 07ca702..c7c4157 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/WorkOrderVO.java
@@ -33,6 +33,11 @@
/** 宸ュ崟鏉ユ簮 */
private String source;
+ /**
+ * 鐐逛綅
+ */
+ private Integer pointId;
+
/** 鏁呴殰绫诲瀷 */
private String errorType;
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 e2ca4c8..4fcdc76 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
@@ -16,6 +16,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.Map;
/**
* 宸ュ崟 鍓嶇鎺у埗鍣�
@@ -118,8 +119,8 @@
@PostMapping("/distribute/ids")
@ApiOperation(value = "涓嬪彂閫夋嫨", notes = "涓嬪彂閫夋嫨")
- public Result selectedIdsDistribute(@RequestBody List<Integer> ids, @RequestParam("unitId") Integer unitId) {
- return workOrderService.selectedIdsDistribute(ids, unitId);
+ public Result selectedIdsDistribute(@RequestBody DistributeWorkOrderQuery query) {
+ return workOrderService.selectedIdsDistribute(query.getIds(), query.getUnitId());
}
@GetMapping("/{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 e311724..f136b80 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
@@ -110,8 +110,12 @@
workOrderAuditingRecord.setRemark(form.getAuditingRemark());
workOrderAuditingRecordMapper.insert(workOrderAuditingRecord);
// 娣诲姞鏂伴�氱煡
- Notify notify = new Notify(NotifyTypeEnum.WORK_ORDER, form.getAuditingResult().getDesc(), workOrder.getYwPeopleId(), "0", "0", workOrder.getId());
- notifyService.save(notify);
+ try {
+ Notify notify = new Notify(NotifyTypeEnum.WORK_ORDER, form.getAuditingResult().getDesc(), workOrder.getYwPeopleId(), "0", "0", workOrder.getId());
+ notifyService.save(notify);
+ } catch (Exception e) {
+ return Result.error("瀹℃牳鎴愬姛锛岄�氱煡杩愮淮浜哄憳澶辫触");
+ }
return Result.ok("鎿嶄綔鎴愬姛");
}
--
Gitblit v1.8.0