sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev_xds
姜玉琦 2024-01-22 10:28:41 +08:00
parent ca300ff472
commit de2042e0b9
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectAttendanceUser.java
View File

@ -88,7 +88,7 @@ public class SurProjectAttendanceUser extends BaseEntity
/** 所属班组ID */ /** 所属班组ID */
@Excel(name = "所属班组ID") @Excel(name = "所属班组ID")
private Long groupId; private String groupId;
/** 所属班组 */ /** 所属班组 */
@Excel(name = "所属班组") @Excel(name = "所属班组")
@ -172,7 +172,7 @@ public class SurProjectAttendanceUser extends BaseEntity
u.phone=j.getString("phone"); u.phone=j.getString("phone");
u.degreeName=j.getString("levelOfEducation"); u.degreeName=j.getString("levelOfEducation");
u.recentPhoto=j.getString("profile"); u.recentPhoto=j.getString("profile");
u.groupId=j.getLongValue("teamId",0); u.groupId=j.getString("teamId");
u.groupName=j.getString("teamName"); u.groupName=j.getString("teamName");
u.workTypeCode=j.getString("workerTypeId"); u.workTypeCode=j.getString("workerTypeId");
u.workTypeName=j.getString("workerTypeName"); u.workTypeName=j.getString("workerTypeName");
@ -269,7 +269,7 @@ public class SurProjectAttendanceUser extends BaseEntity
u.birthDate=json.getLongValue("birthDate",0); u.birthDate=json.getLongValue("birthDate",0);
u.phone=json.getString("phone"); u.phone=json.getString("phone");
u.recentPhoto=json.getString("recentPhoto"); u.recentPhoto=json.getString("recentPhoto");
u.groupId=json.getLongValue("groupId",0); u.groupId=json.getString("groupId");
u.groupName=json.getString("groupName"); u.groupName=json.getString("groupName");
u.leader=json.getBooleanValue("leader",false)?1:0; u.leader=json.getBooleanValue("leader",false)?1:0;
u.workTypeCode=json.getString("workTypeCode"); u.workTypeCode=json.getString("workTypeCode");
@ -433,12 +433,12 @@ public class SurProjectAttendanceUser extends BaseEntity
{ {
return recentPhoto; return recentPhoto;
} }
public void setGroupId(Long groupId) public void setGroupId(String groupId)
{ {
this.groupId = groupId; this.groupId = groupId;
} }
public Long getGroupId() public String getGroupId()
{ {
return groupId; return groupId;
} }

8
yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/vo/LabourUserVO.java
View File

@ -45,8 +45,8 @@ public class LabourUserVO {
private String recentPhoto; private String recentPhoto;
/** 所属班组ID */ /** 所属班组ID */
@NotNull(message = "所属班组ID不能为空") @NotBlank(message = "所属班组ID不能为空")
private Long groupId; private String groupId;
/** 所属班组 */ /** 所属班组 */
@NotBlank(message = "所属班组不能为空") @NotBlank(message = "所属班组不能为空")
@ -142,11 +142,11 @@ public class LabourUserVO {
this.recentPhoto = recentPhoto; this.recentPhoto = recentPhoto;
} }
public Long getGroupId() { public String getGroupId() {
return groupId; return groupId;
} }
public void setGroupId(Long groupId) { public void setGroupId(String groupId) {
this.groupId = groupId; this.groupId = groupId;
} }