Commit d42b7493 authored by fangxinjiang's avatar fangxinjiang

项目档案无岗位更新岗位fxj 2024-04-17

parent dff63329
...@@ -18,6 +18,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.entity; ...@@ -18,6 +18,7 @@ package com.yifu.cloud.plus.v1.yifu.archives.entity;
import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.alibaba.excel.annotation.write.style.HeadFontStyle; import com.alibaba.excel.annotation.write.style.HeadFontStyle;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
...@@ -100,6 +101,7 @@ public class TEmpBadRecord extends BaseEntity { ...@@ -100,6 +101,7 @@ public class TEmpBadRecord extends BaseEntity {
* 发生时间 * 发生时间
*/ */
@ExcelAttribute(name = "发生时间",isDate = true, dateFormat = LocalDateTimeUtils.DATE_TIME_PATTERN_DEFAULT) @ExcelAttribute(name = "发生时间",isDate = true, dateFormat = LocalDateTimeUtils.DATE_TIME_PATTERN_DEFAULT)
@DateTimeFormat("yyyy-MM-dd")
@Schema(description ="发生时间") @Schema(description ="发生时间")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("发生时间") @ExcelProperty("发生时间")
...@@ -155,7 +157,7 @@ public class TEmpBadRecord extends BaseEntity { ...@@ -155,7 +157,7 @@ public class TEmpBadRecord extends BaseEntity {
/** /**
* 是否曾经或正在追究与承担过刑事责任 0 是 1 否 * 是否曾经或正在追究与承担过刑事责任 0 是 1 否
*/ */
@ExcelAttribute(name = "是否曾经或正在追究与承担过刑事责任" , isNotEmpty = true, errorInfo = "是否曾经或正在追究与承担过刑事责任不可为空",readConverterExp = "0=是,1=否") @ExcelAttribute(name = "是否曾经或正在追究与承担过刑事责任" , isNotEmpty = false, isExport = false, errorInfo = "是否曾经或正在追究与承担过刑事责任不可为空",readConverterExp = "0=是,1=否")
@Schema(description ="是否曾经或正在追究与承担过刑事责任 0 是 1 否 ") @Schema(description ="是否曾经或正在追究与承担过刑事责任 0 是 1 否 ")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否曾经或正在追究与承担过刑事责任") @ExcelProperty("是否曾经或正在追究与承担过刑事责任")
......
...@@ -93,7 +93,7 @@ public class EmpBadRecordVo extends RowIndex implements Serializable { ...@@ -93,7 +93,7 @@ public class EmpBadRecordVo extends RowIndex implements Serializable {
/** /**
* 是否曾经或正在追究与承担过刑事责任 0 是 1 否 * 是否曾经或正在追究与承担过刑事责任 0 是 1 否
*/ */
@ExcelAttribute(name = "是否曾经或正在追究与承担过刑事责任" , isNotEmpty = true, errorInfo = "是否曾经或正在追究与承担过刑事责任不可为空",readConverterExp = "0=是,1=否") @ExcelAttribute(name = "是否曾经或正在追究与承担过刑事责任" , isNotEmpty = false, errorInfo = "是否曾经或正在追究与承担过刑事责任不可为空",readConverterExp = "0=是,1=否")
@Schema(description ="是否曾经或正在追究与承担过刑事责任 0 是 1 否 ") @Schema(description ="是否曾经或正在追究与承担过刑事责任 0 是 1 否 ")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("是否曾经或正在追究与承担过刑事责任") @ExcelProperty("是否曾经或正在追究与承担过刑事责任")
......
...@@ -92,7 +92,7 @@ public class EmpCertificateExcelVO extends RowIndex implements Serializable { ...@@ -92,7 +92,7 @@ public class EmpCertificateExcelVO extends RowIndex implements Serializable {
/** /**
* 是否最高资格0是/1否 * 是否最高资格0是/1否
*/ */
@ExcelAttribute(name = "是否最高资格",isNotEmpty = true,errorInfo = "是否最高资格不可为空",readConverterExp = "0=是,1=否") @ExcelAttribute(name = "是否最高资格",isNotEmpty = false,errorInfo = "是否最高资格不可为空",readConverterExp = "0=是,1=否")
@NotNull(message = "是否最高资格不可为空") @NotNull(message = "是否最高资格不可为空")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value ="是否最高资格") @ExcelProperty(value ="是否最高资格")
......
...@@ -799,6 +799,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -799,6 +799,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
errorMsg.add("手机号码必填!"); errorMsg.add("手机号码必填!");
errorMsgMap.put(lineNum, new ErrorMessage("手机号码必填!")); errorMsgMap.put(lineNum, new ErrorMessage("手机号码必填!"));
} }
if (Common.isEmpty(employeeInfo.getEmpRegisType())) {
errorMsg.add("户口性质!");
errorMsgMap.put(lineNum, new ErrorMessage("户口性质!"));
}
if (Common.isEmpty(employeeInfo.getEmpNatrue())) { if (Common.isEmpty(employeeInfo.getEmpNatrue())) {
errorMsg.add("员工类型必填!"); errorMsg.add("员工类型必填!");
errorMsgMap.put(lineNum, new ErrorMessage("员工类型必填!")); errorMsgMap.put(lineNum, new ErrorMessage("员工类型必填!"));
......
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