Commit deb11991 authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/develop'

parents a01c7d7e e3624d36
...@@ -31,6 +31,8 @@ import java.lang.reflect.Method; ...@@ -31,6 +31,8 @@ import java.lang.reflect.Method;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.*; import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static com.yifu.cloud.plus.v1.yifu.salary.util.SalaryCommonUtil.setFields; import static com.yifu.cloud.plus.v1.yifu.salary.util.SalaryCommonUtil.setFields;
...@@ -531,6 +533,23 @@ public class SalaryAccountUtil implements Serializable { ...@@ -531,6 +533,23 @@ public class SalaryAccountUtil implements Serializable {
// 统一处理连接查询 // 统一处理连接查询
if (updateEmpList != null && !updateEmpList.isEmpty()) { if (updateEmpList != null && !updateEmpList.isEmpty()) {
String areaProvince;
String areaCity;
for (TSalaryEmployee employee : updateEmpList) {
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()) && regNumber(employee.getBankCity())) {
areaCity = ExcelUtil.getRedisAreaValue(CacheConstants.AREA_VALUE + employee.getBankCity().trim()
+ CommonConstants.DOWN_LINE_STRING + employee.getBankProvince().trim());
if (Common.isNotNull(areaCity)) {
employee.setBankCity(areaCity);
}
}
employee.setBankProvince(areaProvince);
}
}
}
tSalaryEmployeeService.updateBatchById(updateEmpList); tSalaryEmployeeService.updateBatchById(updateEmpList);
} }
if (!checkBankInfoEmpList.isEmpty()) { if (!checkBankInfoEmpList.isEmpty()) {
...@@ -650,6 +669,16 @@ public class SalaryAccountUtil implements Serializable { ...@@ -650,6 +669,16 @@ public class SalaryAccountUtil implements Serializable {
this.setErrorInfo(errorList); this.setErrorInfo(errorList);
} }
private static boolean regNumber(String content) {
boolean flag = true;
Pattern p = Pattern.compile("^[0-9]*$");
Matcher m = p.matcher(content);
if (m.matches()) {
flag = false;
}
return flag;
}
// updateEmpBankList hgw 2024-7-22 10:18:02 更新开户行卡号等信息,以表导入为准 // updateEmpBankList hgw 2024-7-22 10:18:02 更新开户行卡号等信息,以表导入为准
private boolean setEntityByEmpInfo(TSettleDomainSelectVo dept, Map<String, Integer> ownEmployeeMap private boolean setEntityByEmpInfo(TSettleDomainSelectVo dept, Map<String, Integer> ownEmployeeMap
, Map<String, Integer> ownDeptMap, String salaryType, Integer isIssue, List<ErrorMessage> errorList , Map<String, Integer> ownDeptMap, String salaryType, Integer isIssue, List<ErrorMessage> errorList
......
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