From 206725842b8c94dcaf2858ec0248af7e4b9fdc3e Mon Sep 17 00:00:00 2001
From: liuyiliang <azc78910>
Date: Fri, 26 Jul 2024 15:11:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=A4=84=E7=90=86=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E5=B1=9E=E6=80=A7=E7=B1=BB=E5=9E=8B=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/energy/modules/auth/utils/TokenUtil.java  |  1 +
 .../modules/smart/controller/WorkOrderController.java  |  7 ++++++-
 .../org/energy/modules/smart/entity/WorkOrder.java     | 10 +++++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/energy/modules/auth/utils/TokenUtil.java b/src/main/java/org/energy/modules/auth/utils/TokenUtil.java
index 3e83c30..589bebb 100644
--- a/src/main/java/org/energy/modules/auth/utils/TokenUtil.java
+++ b/src/main/java/org/energy/modules/auth/utils/TokenUtil.java
@@ -44,6 +44,7 @@ public class TokenUtil {
 	public final static String HEADER_KEY = "Authorization";
 	public final static String HEADER_PREFIX = "Basic ";
 	public final static String DEFAULT_AVATAR = "https://gw.alipayobjects.com/zos/rmsportal/BiazfanxmamNRoxxVxka.png";
+	public final static String SYSTEM_NOT_DATA = "未找到数据";
 
 	/**
 	 * 创建认证token
diff --git a/src/main/java/org/energy/modules/smart/controller/WorkOrderController.java b/src/main/java/org/energy/modules/smart/controller/WorkOrderController.java
index e3371b5..4e7d51c 100644
--- a/src/main/java/org/energy/modules/smart/controller/WorkOrderController.java
+++ b/src/main/java/org/energy/modules/smart/controller/WorkOrderController.java
@@ -19,6 +19,7 @@ import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.dayu.daf.core.boot.ctrl.DafController;
 import com.dayu.daf.core.log.annotation.ApiLog;
+import com.dayu.daf.core.log.exception.ServiceException;
 import com.dayu.daf.core.mp.support.Condition;
 import com.dayu.daf.core.mp.support.Query;
 import com.dayu.daf.core.tool.api.R;
@@ -30,6 +31,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
 import org.apache.commons.codec.Charsets;
+import org.energy.modules.auth.utils.TokenUtil;
 import org.energy.modules.smart.entity.WorkOrder;
 import org.energy.modules.smart.excel.WorkOrderExcel;
 import org.energy.modules.smart.service.IWorkOrderService;
@@ -159,7 +161,10 @@ public class WorkOrderController extends DafController {
 	public R approve(Integer status, String ids) {
 		List<WorkOrder> list = new ArrayList<>();
 		for (String id : ids.split(",")) {
-			WorkOrder workOrder = new WorkOrder();
+			WorkOrder workOrder = workOrderService.getById(id);
+			if (workOrder == null) {
+				throw new ServiceException(TokenUtil.SYSTEM_NOT_DATA);
+			}
 			workOrder.setId(Long.parseLong(id));
 			workOrder.setApprovalStatus(status);
 			list.add(workOrder);
diff --git a/src/main/java/org/energy/modules/smart/entity/WorkOrder.java b/src/main/java/org/energy/modules/smart/entity/WorkOrder.java
index 90c20f8..98e16a4 100644
--- a/src/main/java/org/energy/modules/smart/entity/WorkOrder.java
+++ b/src/main/java/org/energy/modules/smart/entity/WorkOrder.java
@@ -1,5 +1,7 @@
 package org.energy.modules.smart.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.dayu.daf.core.mp.base.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -18,7 +20,7 @@ import java.time.LocalDateTime;
  * 实体类
  *
  * @author Daf
- * @since 2024-07-12
+ * @since 2024-07-@TableField(updateStrategy = FieldStrategy.IGNORED)
  */
 @Data
 @TableName("smt_work_order")
@@ -54,6 +56,7 @@ public class WorkOrder extends BaseEntity {
     /**
      * 内容描述
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     @ApiModelProperty(value = "内容描述")
     private String description;
     /**
@@ -75,6 +78,7 @@ public class WorkOrder extends BaseEntity {
     /**
      * 维护作业类型
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     @ApiModelProperty(value = "维护作业类型")
     private String maintenanceTaskType;
     /**
@@ -96,6 +100,7 @@ public class WorkOrder extends BaseEntity {
     /**
      * 处理时间
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     @ApiModelProperty(value = "处理时间")
     private LocalDateTime processingTime;
     /**
@@ -106,17 +111,20 @@ public class WorkOrder extends BaseEntity {
     /**
      * 处理过程描述
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     @ApiModelProperty(value = "处理过程描述")
     private String processDescription;
     /**
      * 结束时间
      */
+    @TableField(updateStrategy = FieldStrategy.IGNORED)
     @ApiModelProperty(value = "结束时间")
     private LocalDateTime endTime;
     /**
      * 处理结果
      */
 	@JsonSerialize(nullsUsing = NullSerializer.class)
+	@TableField(updateStrategy = FieldStrategy.IGNORED)
     @ApiModelProperty(value = "处理结果")
     private Integer handlingResult;
     /**