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

港湾多语言修复

This commit is contained in:
Harryxzy 2024-07-10 14:38:54 +08:00
parent 490cc4f224
commit c1bdcc94fe
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/engine/salary/wrapper/SalaryItemWrapper.java
View File

@ -220,8 +220,10 @@ public class SalaryItemWrapper extends Service {
if (StringUtils.isNotBlank(formulaRunScript)) {
String formula = formulaRunScript;
String[] items = formulaRunScript.split("[\\.\\+\\-\\*\\=<=>()/!%]");
String[] items = formulaRunScript.split("[\\.\\+\\-\\*\\=<=>()/!%,]");
List<String> itemList = Arrays.asList(items).stream().filter(f -> f.contains("_")).collect(Collectors.toList());
itemList = itemList.stream().sorted(Comparator.reverseOrder()).collect(Collectors.toList());
Map<String, String> allFieldIdNameMap = getRemoteExcelService(user).allFieldIdNameMap();
for (String item : itemList) {
@ -236,6 +238,13 @@ public class SalaryItemWrapper extends Service {
}
public static void main(String[] args) {
String test="IF(attend_1>0,(attend_14)*((salaryArchives_baseSalary+salaryArchives_postSalary+salaryArchives_29298fdc9bad4acf9ed3a71a65b74953)/21.75),0)";
String[] items = test.split("[\\.\\+\\-\\*\\=<=>()/!%,]");
Arrays.sort(items, (s1, s2) -> s2.compareTo(s1));
System.out.println(items);
}
//由变量id获取当前的变量名称
public String getFieldNameByFieldId(String fieLdId) {
Map<String, String> allFieldIdNameMap = getRemoteExcelService(user).allFieldIdNameMap();