From 2e2011371699eeb17324ffd947279a03b92d2dff Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 10 十二月 2025 15:21:06 +0800
Subject: [PATCH] 修改实体类字段

---
 fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolKey.java  |   26 ++++++++++++++++++++++++++
 fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Patrol.java     |   19 ++++++++++++-------
 fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolConf.java |   13 +++++++++++++
 3 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Patrol.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Patrol.java
index 81da056..36be5ee 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Patrol.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/Patrol.java
@@ -5,10 +5,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.io.Serializable;
 
 @Data
@@ -16,6 +13,7 @@
 @Table(name = "d_patrol")
 @TableName("d_patrol")
 @EqualsAndHashCode(callSuper = false)
+@IdClass(PatrolKey.class)
 public class Patrol extends BizBaseEntity implements Serializable {
 
     /**
@@ -28,15 +26,22 @@
     @TableField("id")
     private String id;
 
-    @Column(name = "dept_id", columnDefinition = "varchar(40) COMMENT '鎵�灞炲簱鍖�'")
-    @TableField("dept_id")
-    private String deptId;
+    @Id
+    @Column(name = "user_id", columnDefinition = "varchar(40) COMMENT '宸￠�讳汉璐﹀彿'")
+    @TableField("user_id")
+    private String userId;
 
+    @Id
     @Column(name = "batch_id", columnDefinition = "varchar(40) COMMENT '鐝缂栧彿'")
     @TableField("batch_id")
     private String batchId;
 
+    @Column(name = "dept_id", columnDefinition = "varchar(40) COMMENT '鎵�灞炲簱鍖�'")
+    @TableField("dept_id")
+    private String deptId;
+
     @Column(name = "user_name", columnDefinition = "varchar(40) COMMENT '宸￠�讳汉'")
     @TableField("user_name")
     private String userName;
+
 }
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolConf.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolConf.java
index 5cd8850..d4edf4c 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolConf.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolConf.java
@@ -12,6 +12,7 @@
 import javax.persistence.Id;
 import javax.persistence.Table;
 import java.io.Serializable;
+import java.util.Date;
 
 @Data
 @Entity
@@ -31,6 +32,10 @@
     @TableField("batch_id")
     private String batchId;
 
+    @Column(name = "dept_id", columnDefinition = "varchar(40) COMMENT '鎵�灞炲簱鍖�'")
+    @TableField("dept_id")
+    private String deptId;
+
     @Column(name = "batch_name", columnDefinition = "varchar(40) COMMENT '鐝鍚嶇О'")
     @TableField("batch_name")
     private String batchName;
@@ -39,4 +44,12 @@
     @TableField("user_name")
     private String userName;
 
+    @Column(name = "start", columnDefinition = "datetime COMMENT '璧峰鏃堕棿'")
+    @TableField("start")
+    private Date start;
+
+    @Column(name = "end", columnDefinition = "datetime COMMENT '鎴鏃堕棿'")
+    @TableField("end")
+    private Date end;
+
 }
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolKey.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolKey.java
new file mode 100644
index 0000000..b144087
--- /dev/null
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/domain/PatrolKey.java
@@ -0,0 +1,26 @@
+package com.fzzy.igds.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description 涓婚敭ID
+ * @Author CZT
+ * @Date 2025/11/26 10:18
+ */
+@Data
+@AllArgsConstructor
+public class PatrolKey implements Serializable {
+
+        private String id;
+
+        private String userId;
+
+        private String batchId;
+
+    public PatrolKey(){
+            super();
+        }
+    }
\ No newline at end of file

--
Gitblit v1.9.3