Commit 07f8b9b8 authored by hongguangwu's avatar hongguangwu

身份证唯一

parent c18645de
...@@ -69,9 +69,8 @@ public class TSalaryEmployeeUpdateVo extends RowIndex implements Serializable { ...@@ -69,9 +69,8 @@ public class TSalaryEmployeeUpdateVo extends RowIndex implements Serializable {
/** /**
* 项目编码 * 项目编码
*/ */
@NotBlank(message = "项目编码 不能为空")
@Length(max = 30, message = "项目编码 不能超过30 个字符") @Length(max = 30, message = "项目编码 不能超过30 个字符")
@ExcelAttribute(name = "项目编码", isNotEmpty = true, errorInfo = "项目编码 不能为空", maxLength = 30) @ExcelAttribute(name = "项目编码", maxLength = 30)
@Schema(description = "项目编码") @Schema(description = "项目编码")
@HeadFontStyle(fontHeightInPoints = 11) @HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty("项目编码") @ExcelProperty("项目编码")
......
...@@ -478,6 +478,9 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe ...@@ -478,6 +478,9 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
if (Common.isNotNull(excel.getEmpPhone())) { if (Common.isNotNull(excel.getEmpPhone())) {
emp.setEmpPhone(excel.getEmpPhone()); emp.setEmpPhone(excel.getEmpPhone());
} }
if (Common.isNotNull(excel.getEmpName())) {
emp.setEmpName(excel.getEmpName());
}
baseMapper.updateById(emp); baseMapper.updateById(emp);
if (curTaxMonth) { if (curTaxMonth) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), SalaryConstants.CUR_TAX_INFO)); errorMessageList.add(new ErrorMessage(excel.getRowIndex(), SalaryConstants.CUR_TAX_INFO));
......
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