Commit 82399e1c authored by huyuchen's avatar huyuchen

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

parents ee6b0237 140df5d7
......@@ -3209,14 +3209,14 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if(Common.isNotNull(basicInfo.getEmpIdCard())){
// 赋值紧急联系人信息
if(Common.isNotNull(contactMap.get(basicInfo.getEmpIdCard()))){
if(Common.isNotNull(contactMap) && Common.isNotNull(contactMap.get(basicInfo.getEmpIdCard()))){
TEmpContactInfo contactInfo = contactMap.get(basicInfo.getEmpIdCard());
basicInfo.setEmergencyContactName(contactInfo.getEmpName());
basicInfo.setEmergencyContactRelation(contactInfo.getRelationType());
basicInfo.setEmergencyContactPhone(contactInfo.getTel());
}
// 赋值社保户
if(Common.isNotNull(socialFundMap.get(basicInfo.getEmpIdCard()))){
if(Common.isNotNull(socialFundMap) && Common.isNotNull(socialFundMap.get(basicInfo.getEmpIdCard()))){
basicInfo.setSocialHouseholdName(socialFundMap.get(basicInfo.getEmpIdCard()));
}
}
......
......@@ -529,10 +529,10 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
//if (Common.isEmpty(employee.getIssueStatus()) || employee.getIssueStatus().equals(CommonConstants.ZERO_INT)) {
oldEmp = updateEmpBankMap.get(employee.getEmpIdcard());
if (oldEmp != null) {
if (Common.isNotNull(employee.getBankProvince())) {
if (Common.isNotNull(employee.getBankProvince()) && regNumber(employee.getBankProvince())) {
areaProvince = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + employee.getBankProvince().trim());
if (Common.isNotNull(areaProvince)) {
if (Common.isNotNull(employee.getBankCity())) {
if (Common.isNotNull(employee.getBankCity()) && regNumber(employee.getBankCity())) {
areaCity = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + employee.getBankCity().trim()
+ CommonConstants.DOWN_LINE_STRING + employee.getBankProvince().trim());
if (Common.isNotNull(areaCity)) {
......
......@@ -869,6 +869,10 @@ public class SalaryAccountUtil implements Serializable {
// 2025-8-5 17:29:33 以本表为准,且写了是新员工,新增手机号也用表里的 倩倩与荣珍同意
if (Common.isNotNull(entity.getEmpPhone())){
emp.setEmpPhone(entity.getEmpPhone());
} else {
error = "第" + i + SalaryConstants.LINE_EMP + emp.getEmpIdcard() + "-新员工以本次导入为准,手机号不可为空,请在工资模板正确填写!";
errorList.add(new ErrorMessage(i, error));
return true;
}
updateEmpBankList.add(emp);
} else if (salaryGiveTimeFlag) {
......@@ -897,6 +901,11 @@ public class SalaryAccountUtil implements Serializable {
errorList.add(new ErrorMessage(i, error));
return true;
}
if (Common.isEmpty(emp.getEmpPhone())) {
error = "第" + i + SalaryConstants.LINE_EMP + emp.getEmpIdcard() + "-发放方式为银行发放,但是-手机号-为空,请去薪酬人员查询处更新!";
errorList.add(new ErrorMessage(i, error));
return true;
}
entity.setBankName(emp.getBankName());
entity.setBankNo(emp.getBankNo());
entity.setBankProvince(String.valueOf(emp.getBankProvince()));
......@@ -1260,12 +1269,20 @@ public class SalaryAccountUtil implements Serializable {
areaStr = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + entity.getBankProvince().trim());
if (Common.isNotNull(areaStr)) {
newEmp.setBankProvince(areaStr);
} else {
error = "第" + i + "行:" + newEmpStr + "-开户行省错误:" + entity.getBankProvince();
errorList.add(new ErrorMessage(i, error));
return false;
}
if (Common.isNotNull(entity.getBankCity())) {
areaStr = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + entity.getBankCity().trim()
+ CommonConstants.DOWN_LINE_STRING + entity.getBankProvince().trim());
if (Common.isNotNull(areaStr)) {
newEmp.setBankCity(areaStr);
} else {
error = "第" + i + "行:" + newEmpStr + "-开户行市错误:" + entity.getBankCity();
errorList.add(new ErrorMessage(i, error));
return false;
}
}
}
......
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