From de2042e0b981e086a0e6d48ff6016c5699891cb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Mon, 22 Jan 2024 10:28:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jh/project/domain/SurProjectAttendanceUser.java    | 10 +++++-----
 .../com/yanzhu/jh/project/domain/vo/LabourUserVO.java  |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUser.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUser.java
index b020c4b1..9724dc19 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUser.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUser.java
@@ -88,7 +88,7 @@ public class SurProjectAttendanceUser extends BaseEntity
 
     /** 所属班组ID */
     @Excel(name = "所属班组ID")
-    private Long groupId;
+    private String groupId;
 
     /** 所属班组 */
     @Excel(name = "所属班组")
@@ -172,7 +172,7 @@ public class SurProjectAttendanceUser extends BaseEntity
         u.phone=j.getString("phone");
         u.degreeName=j.getString("levelOfEducation");
         u.recentPhoto=j.getString("profile");
-        u.groupId=j.getLongValue("teamId",0);
+        u.groupId=j.getString("teamId");
         u.groupName=j.getString("teamName");
         u.workTypeCode=j.getString("workerTypeId");
         u.workTypeName=j.getString("workerTypeName");
@@ -269,7 +269,7 @@ public class SurProjectAttendanceUser extends BaseEntity
         u.birthDate=json.getLongValue("birthDate",0);
         u.phone=json.getString("phone");
         u.recentPhoto=json.getString("recentPhoto");
-        u.groupId=json.getLongValue("groupId",0);
+        u.groupId=json.getString("groupId");
         u.groupName=json.getString("groupName");
         u.leader=json.getBooleanValue("leader",false)?1:0;
         u.workTypeCode=json.getString("workTypeCode");
@@ -433,12 +433,12 @@ public class SurProjectAttendanceUser extends BaseEntity
     {
         return recentPhoto;
     }
-    public void setGroupId(Long groupId) 
+    public void setGroupId(String groupId)
     {
         this.groupId = groupId;
     }
 
-    public Long getGroupId() 
+    public String getGroupId()
     {
         return groupId;
     }
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/LabourUserVO.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/LabourUserVO.java
index 7580dc03..f085da46 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/LabourUserVO.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/LabourUserVO.java
@@ -45,8 +45,8 @@ public class LabourUserVO {
     private String recentPhoto;
 
     /** 所属班组ID */
-    @NotNull(message = "所属班组ID不能为空")
-    private Long groupId;
+    @NotBlank(message = "所属班组ID不能为空")
+    private String groupId;
 
     /** 所属班组 */
     @NotBlank(message = "所属班组不能为空")
@@ -142,11 +142,11 @@ public class LabourUserVO {
         this.recentPhoto = recentPhoto;
     }
 
-    public Long getGroupId() {
+    public String getGroupId() {
         return groupId;
     }
 
-    public void setGroupId(Long groupId) {
+    public void setGroupId(String groupId) {
         this.groupId = groupId;
     }