From 4c7296d45efe849dc70a3b2e2240c905481a91c9 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 29 九月 2025 17:44:46 +0800
Subject: [PATCH] 工控网涉密网联调

---
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/task/entity/MachineBackTask.java |   28 +++++++++++++++++++++++++---
 1 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/task/entity/MachineBackTask.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/task/entity/MachineBackTask.java
index 3372414..d44f53d 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/task/entity/MachineBackTask.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/task/entity/MachineBackTask.java
@@ -1,5 +1,6 @@
 package org.springblade.mdm.gkw.task.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Getter;
 import lombok.Setter;
@@ -16,13 +17,21 @@
 @TableName("mdm_machine_back_task")
 public class MachineBackTask extends BizEntity {
 	/**
+	 * 鐘舵�侊細鏈畬鎴�
+	 */
+	public static int STATUS_PENDING = 1;
+	/**
+	 * 鐘舵�侊細宸插畬鎴�
+	 */
+	public static int STATUS_FINISHED = 2;
+	/**
 	 * 浠诲姟绫诲瀷锛氬伐鑹虹紪鍒朵换鍔�
 	 */
-	private static final long TASK_TYPE_PROGRAM = 1;
+	public static final int TASK_TYPE_PROGRAM = 1;
 	/**
 	 * 浠诲姟绫诲瀷锛氱幇鍦虹紪鍒朵换鍔�
 	 */
-	private static final long TASK_TYPE_ON_MACHINE = 2;
+	public static final int TASK_TYPE_ON_MACHINE = 2;
 	/**
 	 * 鏂囦欢鍚�
 	 */
@@ -37,9 +46,22 @@
 	 */
 	private String deviation;
 	/**
+	 * 涓存椂鏇存敼鍗曞簭鍙�
+	 */
+	private String deviationSerial;
+	/**
+	 * 绋嬪簭鎬绘鏁�/鐜板満缂栧埗鐨�=0
+	 */
+	private int segCount;
+	/**
 	 * 浠诲姟绫诲瀷
 	 */
-	private String taskType;
+	@TableField("task_type")
+	private int taskType;
 
 	private Date finishTime;
+
+	public boolean isProgramOnMachineTask(){
+		return taskType == TASK_TYPE_ON_MACHINE;
+	}
 }

--
Gitblit v1.9.3