Skip to content

Y
yifu-mvp
Commit d8a63bf6 authored by hongguangwu's avatar hongguangwu
Browse files
Options

Merge remote-tracking branch 'origin/MVP1.6.6' into MVP1.6.6

parents 82079d6b 5d4ec442
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 9 deletions
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TEmpBadRecord.java
View file @ d8a63bf6
......@@ -157,9 +157,10 @@ public class TEmpBadRecord extends BaseEntity {
/**
* 是否曾经或正在追究与承担过刑事责任 0 是 1 否
*/
@ExcelAttribute(name = "是否曾经或正在追究与承担过刑事责任" , isNotEmpty = false, isExport = false, errorInfo = "是否曾经或正在追究与承担过刑事责任不可为空",readConverterExp = "0=是,1=否")
@ExcelAttribute(name = "是否曾经或正在追究与承担过刑事责任" , isNotEmpty = false,needExport = false, errorInfo = "是否曾经或正在追究与承担过刑事责任不可为空",readConverterExp = "0=是,1=否")
@Schema(description ="是否曾经或正在追究与承担过刑事责任 0 是 1 否 ")
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否曾经或正在追究与承担过刑事责任")
@ExcelIgnore
private BigDecimal badRecordFlag;
}
yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/EmployeeContractVO.java
View file @ d8a63bf6
......@@ -47,6 +47,7 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
@Length(max = 20, message = "员工姓名不能超过20个字符")
@ExcelAttribute(name = "员工姓名", isNotEmpty = true, maxLength = 20, needExport = true)
@Schema(description = "员工姓名", name = "empName")
@ExcelProperty("员工姓名")
private String empName;
/**
* 员工身份证号
......@@ -54,6 +55,7 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
@Length(max = 20, message = "身份证号不能超过20个字符")
@ExcelAttribute(name = "身份证号", isNotEmpty = true, maxLength = 20, isIdCard = true, needExport = true)
@Schema(description = "身份证号", name = "empIdcard")
@ExcelProperty("身份证号")
private String empIdcard;
/**
......@@ -62,6 +64,7 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
@Length(max = 20, message = "项目编码不能超过20个字符")
@ExcelAttribute(name = "项目编码", isNotEmpty = true, maxLength = 20, needExport = true)
@Schema(description = "项目编码")
@ExcelProperty("项目编码")
private String deptNo;
/**
......@@ -71,6 +74,7 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
@Length(max = 20, message = "签订类型不能超过20个字符")
@ExcelAttribute(name = "签订类型", isNotEmpty = true, errorInfo = "签订类型不能为空", maxLength = 20, isDataId = true, dataType = ExcelAttributeConstants.EMPLOYEE_SITUATION_TYPE)
@Schema(description = "签订类型（字典）", name = "situation")
@ExcelProperty("签订类型")
private String situation;
/**
......@@ -80,6 +84,7 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
@Length(max = 32, message = "合同类型不能超过32个字符")
@ExcelAttribute(name = "合同类型", maxLength = 32, needExport = true)
@Schema(description = "合同类型", name = "contractName")
@ExcelProperty("合同类型")
private String contractName;
/**
......@@ -89,6 +94,7 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
@Length(max = 32, message = "业务细分不能超过32个字符")
@ExcelAttribute(name = "业务细分", maxLength = 32, needExport = true)
@Schema(description = "业务细分", name = "contractName")
@ExcelProperty("业务细分")
private String contractSubName;
/**
......@@ -97,6 +103,7 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
@Length(max = 200, message = "原因说明不能超过200个字符")
@ExcelAttribute(name = "原因说明", maxLength = 200, needExport = true)
@Schema(description = "原因说明", name = "reason")
@ExcelProperty("原因说明")
private String reason;
/**
......@@ -106,6 +113,7 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
@ExcelAttribute(name = "合同甲方", maxLength = 50, needExport = true)
@Schema(description = "合同甲方")
@Size(max = 50, message = "合同甲方不可超过50位")
@ExcelProperty("合同甲方")
private String contractParty;
/**
......@@ -118,6 +126,7 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
@Length(max = 32, message = "签订期限不能超过32个字符")
@ExcelAttribute(name = "签订期限", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.EMPLOYEE_CONTRACT_TYPE, needExport = true)
@Schema(description = "签订期限", name = "contractType")
@ExcelProperty("签订期限")
private String contractType;
/**
......@@ -127,6 +136,7 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
@DateTimeFormat("yyyy-MM-dd")
@ExcelAttribute(name = "起始日期", isDate = true)
@Schema(description = "起始日期", name = "contractStart")
@ExcelProperty("起始日期")
private Date contractStart;
/**
* 合同到期时间
......@@ -134,6 +144,7 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
@ExcelAttribute(name = "截止日期", needExport = true, isDate = true)
@DateTimeFormat("yyyy-MM-dd")
@Schema(description = "截止日期", name = "contractEnd")
@ExcelProperty("截止日期")
private Date contractEnd;
/**
......@@ -142,6 +153,7 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
@Length(max = 32, message = "合同岗位不能超过32个字符")
@ExcelAttribute(name = "合同岗位", maxLength = 32, needExport = true)
@Schema(description = "合同岗位", name = "post")
@ExcelProperty("合同岗位")
private String post;
/**
......@@ -150,6 +162,7 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
@Length(max = 32, message = "工时制不能超过32个字符")
@ExcelAttribute(name = "工时制", maxLength = 32, isDataId = true, dataType = ExcelAttributeConstants.WORKING_HOURS)
@Schema(description = "工时制（数据字典） 1标准工时 2 综合工时 3不定时工时制", name = "workingHours")
@ExcelProperty("工时制")
private String workingHours;
/**
......@@ -159,6 +172,7 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
@Length(max = 50, message = "合同编码不能超过50个字符")
@ExcelAttribute(name = "合同编码", maxLength = 50)
@Schema(description = "合同编码", name = "contractNo")
@ExcelProperty("合同编码")
private String contractNo;
/**
......@@ -167,18 +181,21 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
@Length(max = 50, message = "档案柜号不能超过50个字符")
@ExcelAttribute(name = "档案柜号", maxLength = 50)
@Schema(description = "档案柜号", name = "fileCabinetNo")
@ExcelProperty("档案柜号")
private String fileCabinetNo;
/**
* 离职日期
*/
@ExcelAttribute(name = "离职日期")
@Schema(description = "离职日期")
@ExcelProperty("离职日期")
private String leaveDate;
/**
* 终止原因
*/
@ExcelAttribute(name = "终止原因", maxLength = 32)
@Schema(description = "终止原因")
@ExcelProperty("终止原因")
private String reduceReason;
/**
* 备注
......@@ -186,6 +203,7 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
@Length(max = 200, message = "不能超过200个字符")
@ExcelAttribute(name = "备注", maxLength = 200)
@Schema(description = "备注", name = "remark")
@ExcelProperty("备注")
private String remark;
/**
......@@ -194,6 +212,7 @@ public class EmployeeContractVO extends RowIndex implements Serializable {
@Length(max = 1, message = "是否同步终止合同、减项、减档不能超过1个字符")
@ExcelAttribute(name = "是否同步终止合同、减项、减档", maxLength = 1,readConverterExp = "0=是,1=否")
@Schema(description = "是否同步终止合同、减项、减档", name = "changeContractAndEmployee")
@ExcelProperty("是否同步终止合同、减项、减档")
private String changeContractAndEmployee;
/**
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/constants/EmployeeConstants.java
View file @ d8a63bf6
......@@ -50,6 +50,7 @@ public class EmployeeConstants {
public static final String CONTRACT_TYPE_ONE = "1";
public static final String CONTRACT_NO_IN_USE = "暂无可操作的合同";
public static final String CONTRACT_TRY_PERIOD_EMPTY = "试用期不能为空";
public static final String CONTRACT_NAME_EMPTY = "合同类型不能为空";
public static final String CONTRACT_PARTY_EMPTY = "合同甲方不能为空";
public static final String CONTRACT_TYPE_EMPTY = "签订期限不能为空";
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpWorkRecordingServiceImpl.java
View file @ d8a63bf6
......@@ -105,6 +105,10 @@ public class TEmpWorkRecordingServiceImpl extends ServiceImpl<TEmpWorkRecordingM
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.EMP_WORKING_RECODE_END_DATE_NOT_EMPTY)));
continue;
}
if (Common.isEmpty(excel.getWorkJob())){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),MsgUtils.getMessage(ErrorCodes.EMP_WORKING_JOB_NOT_EMPTY)));
continue;
}
// 数据合法情况
insertExcel(excel,emp);
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),CommonConstants.SAVE_SUCCESS));
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeContractInfoServiceImpl.java
View file @ d8a63bf6
......@@ -1134,6 +1134,11 @@ public class TEmployeeContractInfoServiceImpl extends ServiceImpl<TEmployeeContr
if (Common.isEmpty(insert.getEmpIdcard()) || Common.isEmpty(insert.getDeptNo())) {
errorInfo.append(EmployeeConstants.EMPID_NOT_EMPTY);
} else {
//签订类型为 新签 试用期必填
if (EmployeeConstants.SITUATION_ONE.equals(insert.getSituation()) && Common.isEmpty(insert.getTryPeriod())) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), EmployeeConstants.CONTRACT_TRY_PERIOD_EMPTY));
return;
}
//签订类型不是终止的把是否同步终止合同、减项、减档设为空
if (!EmployeeConstants.SITUATION_SEVEN.equals(insert.getSituation())) {
insert.setChangeContractAndEmployee(null);
......
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeInfoServiceImpl.java
View file @ d8a63bf6
......@@ -803,6 +803,16 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
errorMsg.add("户口性质必填！");
errorMsgMap.put(lineNum, new ErrorMessage("户口性质必填！"));
}
//婚姻状态不可为空
if(Common.isEmpty(employeeInfo.getEmpMarriStatus())){
errorMsg.add(EmployeeConstants.MARRY_STATUS_NOT_NULL);
errorMsgMap.put(lineNum, new ErrorMessage(EmployeeConstants.MARRY_STATUS_NOT_NULL));
}
//政治面貌不可为空
if(Common.isEmpty(employeeInfo.getPoliticalStatus())){
errorMsg.add(EmployeeConstants.POLITICAL_STATUS_NOT_NULL);
errorMsgMap.put(lineNum, new ErrorMessage(EmployeeConstants.POLITICAL_STATUS_NOT_NULL));
}
if (Common.isEmpty(employeeInfo.getEmpNatrue())) {
errorMsg.add("员工类型必填！");
errorMsgMap.put(lineNum, new ErrorMessage("员工类型必填！"));
......@@ -1082,14 +1092,6 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
errorMsg = new HashSet<>();
excel = excelVOList.get(i);
//政治面貌不可为空
if(Common.isEmpty(excel.getEmpMarriStatus())){
errorMsg.add(EmployeeConstants.MARRY_STATUS_NOT_NULL);
}
//婚姻状态不可为空
if(Common.isEmpty(excel.getPoliticalStatus())){
errorMsg.add(EmployeeConstants.POLITICAL_STATUS_NOT_NULL);
}
if (deptMap.get(excel.getDeptNo()) == null) {
errorMsg.add(EmployeeConstants.DEPT_NO_ERROR);
}
......
yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/exception/ErrorCodes.java
View file @ d8a63bf6
......@@ -612,4 +612,9 @@ public interface ErrorCodes {
* 工作经历结束日期不可为空
*/
String EMP_WORKING_RECODE_END_DATE_NOT_EMPTY = "emp.work.record.end.date.not.empty";
/**
* 工作岗位不可为空
*/
String EMP_WORKING_JOB_NOT_EMPTY = "emp.work.job.not.empty";
}
yifu-common/yifu-common-core/src/main/resources/i18n/messages_zh_CN.properties
View file @ d8a63bf6
......@@ -235,6 +235,8 @@ emp.dispatch.signle.reduce=\u516C\u79EF\u91D1\u672A\u6D3E\u51CF\uFF0C\u8BF7\u683
emp.work.record.end.date.not.empty=\u5DE5\u4F5C\u7ECF\u5386\u7ED3\u675F\u65E5\u671F\u4E0D\u53EF\u4E3A\u7A7A
emp.work.job.not.empty=\u5DE5\u4F5C\u5C97\u4F4D\u4E0D\u53EF\u4E3A\u7A7A
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment