From 6583de0b7d71991f7ea9a6b9bb0b7a2d119eb6aa 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: Wed, 25 Jun 2025 22:17:28 +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 --- .../manage/api/LabourApiController.java | 10 ++++++ .../manage/api/vo/LabourGroupReqVo.java | 34 ++++++++++++++++--- .../yanzhu/manage/api/vo/LabourUserReqVo.java | 30 +++++++++++++--- 3 files changed, 64 insertions(+), 10 deletions(-) diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/api/LabourApiController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/api/LabourApiController.java index 7c4c714d..d08f6b9d 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/api/LabourApiController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/api/LabourApiController.java @@ -160,6 +160,9 @@ public class LabourApiController extends BaseController { surProjectAttendanceGroup.setName(req.getName()); surProjectAttendanceGroup.setLeaderName(req.getLeaderName()); surProjectAttendanceGroup.setLeaderPhone(req.getLeaderPhone()); + surProjectAttendanceGroup.setType(req.getType()); + surProjectAttendanceGroup.setEnterDate(req.getEnterDate()); + surProjectAttendanceGroup.setExitDate(req.getExitDate()); surProjectAttendanceGroup.setIsDel(req.getIsDel()); surProjectAttendanceGroup.setUpdateBy(VendorsCodeEnum.YANZHU.getCode()); surProjectAttendanceGroup.setUpdateTime(new Date()); @@ -176,6 +179,9 @@ public class LabourApiController extends BaseController { surProjectAttendanceGroup.setName(req.getName()); surProjectAttendanceGroup.setLeaderName(req.getLeaderName()); surProjectAttendanceGroup.setLeaderPhone(req.getLeaderPhone()); + surProjectAttendanceGroup.setType(req.getType()); + surProjectAttendanceGroup.setEnterDate(req.getEnterDate()); + surProjectAttendanceGroup.setExitDate(req.getExitDate()); surProjectAttendanceGroup.setIsDel(req.getIsDel()); surProjectAttendanceGroup.setCreateBy(sysApplyConfig.getAppId()); surProjectAttendanceGroup.setCreateTime(new Date()); @@ -224,9 +230,11 @@ public class LabourApiController extends BaseController { surProjectAttendanceUser.setGroupId(req.getGroupId()); surProjectAttendanceUser.setGroupName(req.getGroupName()); surProjectAttendanceUser.setWorkTypeName(req.getWorkTypeName()); + surProjectAttendanceUser.setWorkerCategory(req.getWorkerCategory()); surProjectAttendanceUser.setSpecWorkType(req.getSpecWorkType()); surProjectAttendanceUser.setState(req.getState()); surProjectAttendanceUser.setEnterDate(req.getEnterDate()); + surProjectAttendanceUser.setExitDate(req.getExitDate()); surProjectAttendanceUser.setCompanyId(req.getCompanyId()); surProjectAttendanceUser.setCompanyName(req.getCompanyName()); surProjectAttendanceUser.setLeader(req.getGroupLeader()); @@ -248,9 +256,11 @@ public class LabourApiController extends BaseController { surProjectAttendanceUser.setGroupId(req.getGroupId()); surProjectAttendanceUser.setGroupName(req.getGroupName()); surProjectAttendanceUser.setWorkTypeName(req.getWorkTypeName()); + surProjectAttendanceUser.setWorkerCategory(req.getWorkerCategory()); surProjectAttendanceUser.setSpecWorkType(req.getSpecWorkType()); surProjectAttendanceUser.setState(req.getState()); surProjectAttendanceUser.setEnterDate(req.getEnterDate()); + surProjectAttendanceUser.setExitDate(req.getExitDate()); surProjectAttendanceUser.setCompanyId(req.getCompanyId()); surProjectAttendanceUser.setCompanyName(req.getCompanyName()); surProjectAttendanceUser.setLeader(req.getGroupLeader()); diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/api/vo/LabourGroupReqVo.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/api/vo/LabourGroupReqVo.java index de4fe4bd..5938a070 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/api/vo/LabourGroupReqVo.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/api/vo/LabourGroupReqVo.java @@ -39,9 +39,17 @@ public class LabourGroupReqVo { private String leaderPhone; /** 进场日期 */ - @NotBlank(message = "进场日期不能为空") - @Size(max = 32, message = "进场日期格式异常") - private String enterDate; + @NotNull(message = "进场日期不能为空") + private Long enterDate; + + /** 退场日期 */ + private Long exitDate; + + /** + * 班组类型1:建筑工人班组;2:管理人员班组 + */ + @NotNull(message = "进场日期不能为空") + private Long type; /** 数据是否有效 */ @NotNull(message = "数据是否有效不能为空") @@ -128,11 +136,27 @@ public class LabourGroupReqVo { this.leaderPhone = leaderPhone; } - public String getEnterDate() { + public Long getEnterDate() { return enterDate; } - public void setEnterDate(String enterDate) { + public void setEnterDate(Long enterDate) { this.enterDate = enterDate; } + + public Long getExitDate() { + return exitDate; + } + + public void setExitDate(Long exitDate) { + this.exitDate = exitDate; + } + + public Long getType() { + return type; + } + + public void setType(Long type) { + this.type = type; + } } diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/api/vo/LabourUserReqVo.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/api/vo/LabourUserReqVo.java index b69ffb80..6d23f482 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/api/vo/LabourUserReqVo.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/api/vo/LabourUserReqVo.java @@ -1,7 +1,5 @@ package com.yanzhu.manage.api.vo; -import com.yanzhu.common.core.annotation.Excel; - import javax.validation.constraints.Max; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -70,10 +68,13 @@ public class LabourUserReqVo { private Long state; /** 进场日期 */ - @NotBlank(message = "进场日期不能为空") - @Size(max = 32, message = "进场日期格式异常") + @NotNull(message = "进场日期不能为空") private String enterDate; + /** 进场日期 */ + @NotNull(message = "进场日期不能为空") + private String exitDate; + /** 分包商id */ @NotBlank(message = "分包商ID不能为空") private String companyId; @@ -83,9 +84,13 @@ public class LabourUserReqVo { private String companyName; /** 是否班组长 */ - @NotNull(message = "是否班组长") + @NotNull(message = "是否班组长不能为空") private Integer groupLeader; + /** 人员类别0：工人，1：管理人员 */ + @NotNull(message = "人员类别不能为空") + private Long workerCategory; + /** 数据是否有效 */ @NotNull(message = "数据是否有效不能为空") @Max(value = 1, message = "数据是否有效格式异常，0有效|1无效") @@ -195,6 +200,14 @@ public class LabourUserReqVo { this.enterDate = enterDate; } + public String getExitDate() { + return exitDate; + } + + public void setExitDate(String exitDate) { + this.exitDate = exitDate; + } + public String getCompanyId() { return companyId; } @@ -227,4 +240,11 @@ public class LabourUserReqVo { this.isDel = isDel; } + public Long getWorkerCategory() { + return workerCategory; + } + + public void setWorkerCategory(Long workerCategory) { + this.workerCategory = workerCategory; + } }