From e956b22dcbe80d89a87722ac65bd6688723759d4 Mon Sep 17 00:00:00 2001 From: mash Date: Fri, 16 Jun 2023 15:09:56 +0800 Subject: [PATCH] update 1.0 --- .../staff/controller/PersonnelController.java | 1 + .../ydool/staff/request/GiveAuditRequest.java | 1 - .../ydool/staff/request/PersonnelRequest.java | 5 +- .../staff/request/PersonnelUpdateRequest.java | 77 +++++++++++++++++-- .../ydool/staff/request/SaveAuditRequest.java | 13 ++++ .../service/impl/PersonnelServiceImpl.java | 18 +++++ 6 files changed, 104 insertions(+), 11 deletions(-) create mode 100644 src/main/java/com/ydool/staff/request/SaveAuditRequest.java diff --git a/src/main/java/com/ydool/staff/controller/PersonnelController.java b/src/main/java/com/ydool/staff/controller/PersonnelController.java index a1f0893..88a1a86 100644 --- a/src/main/java/com/ydool/staff/controller/PersonnelController.java +++ b/src/main/java/com/ydool/staff/controller/PersonnelController.java @@ -124,4 +124,5 @@ public class PersonnelController extends BaseController { } + } diff --git a/src/main/java/com/ydool/staff/request/GiveAuditRequest.java b/src/main/java/com/ydool/staff/request/GiveAuditRequest.java index c793ee2..52782fe 100644 --- a/src/main/java/com/ydool/staff/request/GiveAuditRequest.java +++ b/src/main/java/com/ydool/staff/request/GiveAuditRequest.java @@ -17,7 +17,6 @@ public class GiveAuditRequest { @ApiModelProperty(value = "人员类型：personnel 变更：change") private String type; - @ApiModelProperty(value = "修改数据") private PersonnelUpdateRequest request; } diff --git a/src/main/java/com/ydool/staff/request/PersonnelRequest.java b/src/main/java/com/ydool/staff/request/PersonnelRequest.java index 71b89b7..20ba623 100644 --- a/src/main/java/com/ydool/staff/request/PersonnelRequest.java +++ b/src/main/java/com/ydool/staff/request/PersonnelRequest.java @@ -71,11 +71,9 @@ public class PersonnelRequest { private String hireType; @ApiModelProperty(value = "执业资格") - @NotBlank(message = "执业资格不能为空") private String qualification; @ApiModelProperty(value = "专业技术职称") - @NotBlank(message = "专业技术职称不能为空") private String jobTitle; @ApiModelProperty(value = "所在部门") @@ -140,4 +138,7 @@ public class PersonnelRequest { @ApiModelProperty(value = "审批资料附件") private List auditFile; + + @ApiModelProperty(value = "类型：save 保存 ，audit 保存并送审") + private String type; } diff --git a/src/main/java/com/ydool/staff/request/PersonnelUpdateRequest.java b/src/main/java/com/ydool/staff/request/PersonnelUpdateRequest.java index 6552932..3daa5b3 100644 --- a/src/main/java/com/ydool/staff/request/PersonnelUpdateRequest.java +++ b/src/main/java/com/ydool/staff/request/PersonnelUpdateRequest.java @@ -7,6 +7,7 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.math.BigDecimal; +import java.time.LocalDate; import java.util.Date; import java.util.List; @@ -21,44 +22,104 @@ public class PersonnelUpdateRequest { @NotBlank(message = "id不能为空") private String id; + @ApiModelProperty(value = "姓名") + private String userName; + + @ApiModelProperty(value = "企业名称") + private String companyName; + + @ApiModelProperty(value = "性别") + private String gender; + + @ApiModelProperty(value = "出生日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private LocalDate birthday; + + @ApiModelProperty(value = "身份证号") + private String numberId; + @ApiModelProperty(value = "民族") - @NotBlank(message = "民族不能为空") private String nation; @ApiModelProperty(value = "政治面貌") - @NotBlank(message = "政治面貌不能为空") private String politicsStatus; @ApiModelProperty(value = "学历") - @NotBlank(message = "学历不能为空") private String education; @ApiModelProperty(value = "是否应届毕业生") - @NotBlank(message = "是否应届毕业生不能为空") private String freshGraduate; @ApiModelProperty(value = "毕业院校") - @NotBlank(message = "毕业院校不能为空") private String academy; @ApiModelProperty(value = "专业") - @NotBlank(message = "专业不能为空") private String specialty; + @ApiModelProperty(value = "录用方式") + private String hireType; + + @ApiModelProperty(value = "执业资格证书") + private String qualification; + + @ApiModelProperty(value = "专业技术职称") + private String jobTitle; + @ApiModelProperty(value = "所在部门") - @NotBlank(message = "所在部门不能为空") private String presentDept; + @ApiModelProperty(value = "岗位职务") + private String position; + @ApiModelProperty(value = "合同形式") - @NotBlank(message = "合同形式不能为空") private String contractModality; + @ApiModelProperty(value = "人员类型") + private String personnelType; + + @ApiModelProperty(value = "工作状态") + private String workState; + + @ApiModelProperty(value = "人员性质") + private String personnelCharacter; + + @ApiModelProperty(value = "年薪") + private Integer annualSalary; + + @ApiModelProperty(value = "入职时间") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private LocalDate hireDate; + + @ApiModelProperty(value = "退休时间") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private LocalDate retirementTime; + + @ApiModelProperty(value = "离职时间") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private LocalDate resignationTime; + + @ApiModelProperty(value = "退休返聘开始时间") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private LocalDate txfpStartTime; + + @ApiModelProperty(value = "退休返聘结束时间") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private LocalDate txfpEndTime; + + @ApiModelProperty(value = "人员招聘单号") + private String recruitNumber; + @ApiModelProperty(value = "备注") private String remark; @ApiModelProperty(value = "身份证附件") private List cardFile; + @ApiModelProperty(value = "聘任证书附件") + private List engageFile; + + @ApiModelProperty(value = "职称证书附件") + private List jobTitleFile; @ApiModelProperty(value = "学历证书附件") private List educationFile; diff --git a/src/main/java/com/ydool/staff/request/SaveAuditRequest.java b/src/main/java/com/ydool/staff/request/SaveAuditRequest.java new file mode 100644 index 0000000..a6e3815 --- /dev/null +++ b/src/main/java/com/ydool/staff/request/SaveAuditRequest.java @@ -0,0 +1,13 @@ +package com.ydool.staff.request; + +import lombok.Data; + +/** + * @author msh + * @version 1.0@Data + * public class SaveAuditRequest { + * + * } + * @date 2023/6/14 17:06 + */ + diff --git a/src/main/java/com/ydool/staff/service/impl/PersonnelServiceImpl.java b/src/main/java/com/ydool/staff/service/impl/PersonnelServiceImpl.java index 6843929..28291a4 100644 --- a/src/main/java/com/ydool/staff/service/impl/PersonnelServiceImpl.java +++ b/src/main/java/com/ydool/staff/service/impl/PersonnelServiceImpl.java @@ -224,6 +224,14 @@ public class PersonnelServiceImpl extends BaseService cardFile = updateRequest.getCardFile(); List educationFile = updateRequest.getEducationFile(); List auditFile = updateRequest.getAuditFile(); + List engageFile = updateRequest.getEngageFile(); + List jobTitleFile = updateRequest.getJobTitleFile(); String card = StringUtils.join(saveFilePath(cardFile, ArgsConst.CARD_FILE, ArgsConst.UPDATE, updateRequest.getId()), ','); String education = StringUtils.join(saveFilePath(educationFile, ArgsConst.EDUCATION_FILE, ArgsConst.UPDATE, updateRequest.getId()), ','); String audit = StringUtils.join(saveFilePath(auditFile, ArgsConst.AUDIT_FILE, ArgsConst.UPDATE, updateRequest.getId()), ','); + String engage = StringUtils.join(saveFilePath(engageFile, ArgsConst.ENGAGE_FILE, ArgsConst.UPDATE, updateRequest.getId()), ','); + String job = StringUtils.join(saveFilePath(jobTitleFile, ArgsConst.JOBTITLE_FILE, ArgsConst.UPDATE, updateRequest.getId()), ','); if ("1".equals(per.getAlterationSign())) { return AjaxResult.fail().msg("该人员修改的资料未审批完成，请联系管理员！"); } @@ -284,6 +296,12 @@ public class PersonnelServiceImpl extends BaseService