qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复数值类型判断

This commit is contained in:
钱涛 2025-03-13 16:02:00 +08:00
parent 9c3bb5f956
commit ccb0dcd8d5
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/engine/salary/entity/datacollection/bo/VariableArchiveExcelBO.java
View File

@ -1,7 +1,7 @@
package com.engine.salary.entity.datacollection.bo; package com.engine.salary.entity.datacollection.bo;
import cn.hutool.core.util.NumberUtil;
import com.engine.core.impl.Service; import com.engine.core.impl.Service;
import com.engine.salary.constant.SalaryArchiveConstant;
import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.constant.SalaryDefaultTenantConstant;
import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.datacollection.param.VariableArchiveImportHandleParam; import com.engine.salary.entity.datacollection.param.VariableArchiveImportHandleParam;
@ -23,7 +23,6 @@ import weaver.general.Util;
import weaver.hrm.User; import weaver.hrm.User;
import java.util.*; import java.util.*;
import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@ -232,7 +231,7 @@ public class VariableArchiveExcelBO extends Service {
if (optionalVariableItem.isPresent()) { if (optionalVariableItem.isPresent()) {
VariableItemPO variableItemPO = optionalVariableItem.get(); VariableItemPO variableItemPO = optionalVariableItem.get();
// 数值类型判断 // 数值类型判断
boolean isNotNumber = variableItemPO.getDataType().equals(SalaryArchiveFieldTypeEnum.NUMBER.getValue()) && StringUtils.isNotEmpty(cellVal) && !Pattern.matches(SalaryArchiveConstant.NUMBER_REGEX, cellVal); boolean isNotNumber = variableItemPO.getDataType().equals(SalaryArchiveFieldTypeEnum.NUMBER.getValue()) && StringUtils.isNotEmpty(cellVal) && !NumberUtil.isNumber(cellVal);
if (isNotNumber) { if (isNotNumber) {
Map<String, String> errorMessageMap = Maps.newHashMap(); Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", rowindex + key + numberErr); errorMessageMap.put("message", rowindex + key + numberErr);

5
src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java
View File

@ -1,7 +1,7 @@
package com.engine.salary.entity.salaryarchive.bo; package com.engine.salary.entity.salaryarchive.bo;
import cn.hutool.core.util.NumberUtil;
import com.engine.core.impl.Service; import com.engine.core.impl.Service;
import com.engine.salary.constant.SalaryArchiveConstant;
import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.constant.SalaryDefaultTenantConstant;
import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveInitImportDTO; import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveInitImportDTO;
@ -35,7 +35,6 @@ import weaver.hrm.User;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.*; import java.util.*;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
@ -826,7 +825,7 @@ public class SalaryArchiveExcelBO extends Service {
if (isEnable) { if (isEnable) {
SalaryItemPO salaryItemPO = optionalSalaryItem.get(); SalaryItemPO salaryItemPO = optionalSalaryItem.get();
// 数值类型判断 // 数值类型判断
boolean isNotNumber = salaryItemPO.getDataType().equals(SalaryArchiveFieldTypeEnum.NUMBER.getValue()) && StringUtils.isNotEmpty(cellVal) && !Pattern.matches(SalaryArchiveConstant.NUMBER_REGEX, cellVal); boolean isNotNumber = salaryItemPO.getDataType().equals(SalaryArchiveFieldTypeEnum.NUMBER.getValue()) && StringUtils.isNotEmpty(cellVal) && !NumberUtil.isNumber(cellVal);
if (isNotNumber) { if (isNotNumber) {
Map<String, String> errorMessageMap = Maps.newHashMap(); Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", rowindex + key + numberErr); errorMessageMap.put("message", rowindex + key + numberErr);