xiangshan
/
lcoa-java
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

This commit is contained in:
mash 2024-11-14 11:43:02 +08:00
parent 6413c0bddc
commit f53db67478
3 changed files with 48 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/ydool/staff/request/PersonnelRequest.java
View File

@ -72,9 +72,15 @@ public class PersonnelRequest {
@ApiModelProperty(value = "执业资格")
private String qualification;
@ApiModelProperty(value = "专业技术职称")
@ApiModelProperty("执业资格(补充)")
private String qualificationType;
@ApiModelProperty("专业技术职称")
private String jobTitle;
@ApiModelProperty("专业技术职称(补充)")
private String jobTitleType;
@ApiModelProperty(value = "所在部门")
@NotBlank(message = "所在部门不能为空")
private String presentDept;

13
src/main/java/com/ydool/staff/request/PersonnelUpdateRequest.java
View File

@ -5,10 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
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;
/**
@ -56,12 +53,18 @@ public class PersonnelUpdateRequest {
@ApiModelProperty(value = "录用方式")
private String hireType;
@ApiModelProperty(value = "执业资格证书")
@ApiModelProperty(value = "执业资格")
private String qualification;
@ApiModelProperty(value = "专业技术职称")
@ApiModelProperty("执业资格(补充)")
private String qualificationType;
@ApiModelProperty("专业技术职称")
private String jobTitle;
@ApiModelProperty("专业技术职称(补充)")
private String jobTitleType;
@ApiModelProperty(value = "合同形式")
private String contractModality;

33
src/main/java/com/ydool/staff/service/impl/PersonnelServiceImpl.java
View File

@ -245,6 +245,9 @@ public class PersonnelServiceImpl extends BaseService<PersonnelMapper, Personnel
personnel.setJobTitleFile(StringUtils.join(saveFilePath(personnelRequest.getJobTitleFile(), ArgsConst.EDUCATION_FILE, ArgsConst.SAVE, ""), ','));
personnel.setEducationFile(StringUtils.join(saveFilePath(personnelRequest.getEducationFile(), ArgsConst.JOBTITLE_FILE, ArgsConst.SAVE, ""), ','));
personnel.setAuditFile(StringUtils.join(saveFilePath(personnelRequest.getAuditFile(), ArgsConst.AUDIT_FILE, ArgsConst.SAVE, ""), ','));
// 表示当前数据
personnel.setState("2");
personnel.setAlterationSign("1");
boolean save = save(personnel);
saveAttachment(personnelRequest.getCardFile(), ArgsConst.CARD_FILE, personnel.getId(), ArgsConst.SAVE);
saveAttachment(personnelRequest.getEngageFile(), ArgsConst.ENGAGE_FILE, personnel.getId(), ArgsConst.SAVE);
@ -649,6 +652,9 @@ public class PersonnelServiceImpl extends BaseService<PersonnelMapper, Personnel
personnel.setCompanyName(selectOne.getId());
personnel.setSocialCreditCode(selectOne.getCreditCode());
}
// 表示当前数据
personnel.setState("2");
personnel.setAlterationSign("1");
personnel.setBirthday(retirementTime(personnelExportVO.getNumberId(), "birthday"));
personnel.setRetirementTime(retirementTime(personnelExportVO.getNumberId(), "retirementTime"));
personnel.setFreshGraduate("是".equals(personnelExportVO.getFreshGraduate()) ? "1" : "0");
@ -767,6 +773,33 @@ public class PersonnelServiceImpl extends BaseService<PersonnelMapper, Personnel
if (StrUtil.isBlank(personnelExportVO.getUserName())) {
failMsgVO.setFailMsg(failMsgVO.getFailMsg() + " 姓名不能为空 ");
}
if (StrUtil.isBlank(personnelExportVO.getPosition())) {
failMsgVO.setFailMsg(failMsgVO.getFailMsg() + " 岗位职务不能为空 ");
}
if (StrUtil.isBlank(personnelExportVO.getPoliticsStatus())) {
failMsgVO.setFailMsg(failMsgVO.getFailMsg() + " 政治面貌不能为空 ");
}
if (StrUtil.isBlank(personnelExportVO.getEducation())) {
failMsgVO.setFailMsg(failMsgVO.getFailMsg() + " 学历不能为空 ");
}
if (StrUtil.isBlank(personnelExportVO.getPresentDept())) {
failMsgVO.setFailMsg(failMsgVO.getFailMsg() + " 所在部门不能为空 ");
}
if (StrUtil.isBlank(personnelExportVO.getNation())) {
failMsgVO.setFailMsg(failMsgVO.getFailMsg() + " 民族不能为空 ");
}
if (StrUtil.isBlank(personnelExportVO.getPersonnelType())) {
failMsgVO.setFailMsg(failMsgVO.getFailMsg() + " 人员类型不能为空 ");
}
if (StrUtil.isBlank(personnelExportVO.getContractModality())) {
failMsgVO.setFailMsg(failMsgVO.getFailMsg() + " 合同形式不能为空 ");
}
if (StrUtil.isBlank(personnelExportVO.getWorkState())) {
failMsgVO.setFailMsg(failMsgVO.getFailMsg() + " 职工状态不能为空 ");
}
if (StrUtil.isBlank(personnelExportVO.getHireType())) {
failMsgVO.setFailMsg(failMsgVO.getFailMsg() + " 录用方式不能为空 ");
}
if (personnelExportVO.getHireDate() == null) {
failMsgVO.setFailMsg(failMsgVO.getFailMsg() + " 入职日期不能为空 ");
}