Commit 262d6b7f authored by hongguangwu's avatar hongguangwu

MVP1.7.0 优化

parent 45cbeee7
...@@ -130,7 +130,7 @@ public class TPreEmployeeInfo extends BaseEntity { ...@@ -130,7 +130,7 @@ public class TPreEmployeeInfo extends BaseEntity {
@ExcelAttribute(name = "出生日期", isDate = true) @ExcelAttribute(name = "出生日期", isDate = true)
@ExcelProperty("出生日期") @ExcelProperty("出生日期")
@Schema(description = "出生日期") @Schema(description = "出生日期")
private Date empBirthday; private java.sql.Date empBirthday;
/** /**
* 年龄 * 年龄
*/ */
......
...@@ -245,7 +245,7 @@ public class EmployeeInsertVO extends RowIndex implements Serializable { ...@@ -245,7 +245,7 @@ public class EmployeeInsertVO extends RowIndex implements Serializable {
@ExcelProperty(value = "通信地址-详细地址") @ExcelProperty(value = "通信地址-详细地址")
private String contactAddress; private String contactAddress;
/*
// 紧急联系人姓名 与本人关系 联系地址-省 联系地址-市 联系地址-区/县 联系地址-详细地址 手机号码(紧急联系人) // 紧急联系人姓名 与本人关系 联系地址-省 联系地址-市 联系地址-区/县 联系地址-详细地址 手机号码(紧急联系人)
@ExcelAttribute(name = "紧急联系人姓名", isNotEmpty = true, errorInfo = "紧急联系人姓名不能为空", maxLength = 20) @ExcelAttribute(name = "紧急联系人姓名", isNotEmpty = true, errorInfo = "紧急联系人姓名不能为空", maxLength = 20)
private String contactEmpName; private String contactEmpName;
...@@ -274,6 +274,6 @@ public class EmployeeInsertVO extends RowIndex implements Serializable { ...@@ -274,6 +274,6 @@ public class EmployeeInsertVO extends RowIndex implements Serializable {
@ExcelAttribute(name = "开户支行", maxLength = 50) @ExcelAttribute(name = "开户支行", maxLength = 50)
private String bankSubName; private String bankSubName;
@ExcelAttribute(name = "计税月份", isDate = true, dateFormat = "yyyyMM", maxLength = 6) @ExcelAttribute(name = "计税月份", isDate = true, dateFormat = "yyyyMM", maxLength = 6)
private String taxMonth; private String taxMonth;*/
} }
...@@ -893,6 +893,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -893,6 +893,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
return R.failed("状态不为待完善,不可编辑!"); return R.failed("状态不为待完善,不可编辑!");
} }
String errorInfo = null; String errorInfo = null;
if (Common.isNotNull(preMain.getStatus()) && !CommonConstants.ONE_STRING.equals(preMain.getStatus())) {
if (Common.isEmpty(tPreEmployee.getEmpNatrue())) { if (Common.isEmpty(tPreEmployee.getEmpNatrue())) {
errorInfo = "【员工类型】"; errorInfo = "【员工类型】";
} }
...@@ -906,6 +907,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -906,6 +907,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if (Common.isNotNull(tPreEmployee.getBankNo()) && Common.isEmpty(tPreEmployee.getTaxMonth())) { if (Common.isNotNull(tPreEmployee.getBankNo()) && Common.isEmpty(tPreEmployee.getTaxMonth())) {
return R.failed("有银行卡号,计税月份必填!"); return R.failed("有银行卡号,计税月份必填!");
} }
}
if (Common.isNotNull(tPreEmployee.getTaxMonth())) { if (Common.isNotNull(tPreEmployee.getTaxMonth())) {
String taxMonth = tPreEmployee.getTaxMonth().trim(); String taxMonth = tPreEmployee.getTaxMonth().trim();
if (!taxMonth.matches(taxMonthRegex)) { if (!taxMonth.matches(taxMonthRegex)) {
...@@ -955,7 +957,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -955,7 +957,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
} else { } else {
this.updateById(main); this.updateById(main);
} }
if (CommonConstants.ONE_STRING.equals(main.getSourType())) { if (CommonConstants.ONE_STRING.equals(main.getSourType())) {
// 更新其他附件信息 fxj 2024-09-09 // 更新其他附件信息 fxj 2024-09-09
updateOtherAtta(preMain); updateOtherAtta(preMain);
...@@ -1963,8 +1964,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1963,8 +1964,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if (Common.isNotNull(idCard) && Common.isEmpty(employeeInfo.getEmpSex()) && idCard.length() > 14) { if (Common.isNotNull(idCard) && Common.isEmpty(employeeInfo.getEmpSex()) && idCard.length() > 14) {
// 出生日期 // 出生日期
String idCardDate = idCard.substring(6, 14); java.sql.Date empBirthday = com.yifu.cloud.plus.v1.yifu.archives.util.IdCardUtil.getBirthdate(idCard);
Date empBirthday = DateUtil.stringDateFormat(idCardDate, "yyyyMMdd");
employeeInfo.setEmpBirthday(empBirthday); employeeInfo.setEmpBirthday(empBirthday);
// 性别 // 性别
...@@ -3127,7 +3127,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -3127,7 +3127,8 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
} }
tPreEmployeeInfo.setEmpNatrue(info.getEmpNatrueValue()); tPreEmployeeInfo.setEmpNatrue(info.getEmpNatrueValue());
tPreEmployeeInfo.setEmpSex(IdCardUtil.getSex(empIdCard)); tPreEmployeeInfo.setEmpSex(IdCardUtil.getSex(empIdCard));
tPreEmployeeInfo.setEmpBirthday(IdCardUtil.getBirthdate(empIdCard)); java.sql.Date empBirthday = com.yifu.cloud.plus.v1.yifu.archives.util.IdCardUtil.getBirthdate(empIdCard);
tPreEmployeeInfo.setEmpBirthday(empBirthday);
tPreEmployeeInfo.setEmpAge(IdCardUtil.IdNOToAge(empIdCard)); tPreEmployeeInfo.setEmpAge(IdCardUtil.IdNOToAge(empIdCard));
tPreEmployeeInfo.setEmpMarriStatus(info.getEmpMarriStatusValue()); tPreEmployeeInfo.setEmpMarriStatus(info.getEmpMarriStatusValue());
tPreEmployeeInfo.setEmpNational(info.getEmpNationalValue()); tPreEmployeeInfo.setEmpNational(info.getEmpNationalValue());
......
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