jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_xd' into dev_xd

dev_xd
haha 2025-06-25 23:15:28 +08:00
parent b494391d44 cb56165890
commit 51f31be16f
3 changed files with 64 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/api/LabourApiController.java
View File

@ -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());

34
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/api/vo/LabourGroupReqVo.java
View File

@ -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;
}
}

30
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/api/vo/LabourUserReqVo.java
View File

@ -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;
}
}