|
|
@ -60,6 +60,8 @@ import weaver.general.StringUtil;
|
|
|
|
import weaver.general.Util;
|
|
|
|
import weaver.general.Util;
|
|
|
|
import weaver.hrm.definedfield.HrmFieldManager;
|
|
|
|
import weaver.hrm.definedfield.HrmFieldManager;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
|
|
|
|
|
import java.math.RoundingMode;
|
|
|
|
import java.util.*;
|
|
|
|
import java.util.*;
|
|
|
|
import java.util.concurrent.atomic.AtomicInteger;
|
|
|
|
import java.util.concurrent.atomic.AtomicInteger;
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
import java.util.stream.Collectors;
|
|
|
@ -155,6 +157,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
List<String> columnList = Arrays.asList(columns.split(","));
|
|
|
|
List<String> columnList = Arrays.asList(columns.split(","));
|
|
|
|
|
|
|
|
BigDecimal decimal = new BigDecimal(100 / columnList.size());
|
|
|
|
for (SearchConditionGroup allCondition : allConditions) {
|
|
|
|
for (SearchConditionGroup allCondition : allConditions) {
|
|
|
|
List<SearchConditionItem> items = allCondition.getItems();
|
|
|
|
List<SearchConditionItem> items = allCondition.getItems();
|
|
|
|
for (SearchConditionItem item : items) {
|
|
|
|
for (SearchConditionItem item : items) {
|
|
|
@ -170,6 +173,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
|
|
|
|
weaTableColumn.setDisplay(columnList.contains(columnName) ? WeaBoolAttr.TRUE : WeaBoolAttr.FALSE);
|
|
|
|
weaTableColumn.setDisplay(columnList.contains(columnName) ? WeaBoolAttr.TRUE : WeaBoolAttr.FALSE);
|
|
|
|
weaTableColumn.setTransmethod("com.engine.organization.transmethod.HrmResourceTransMethod.getFieldTrueValue");
|
|
|
|
weaTableColumn.setTransmethod("com.engine.organization.transmethod.HrmResourceTransMethod.getFieldTrueValue");
|
|
|
|
weaTableColumn.setOtherpara(columnName);
|
|
|
|
weaTableColumn.setOtherpara(columnName);
|
|
|
|
|
|
|
|
weaTableColumn.setWidth(decimal.setScale(2, RoundingMode.HALF_UP).doubleValue() + "%");
|
|
|
|
weaTableColumnList.add(weaTableColumn);
|
|
|
|
weaTableColumnList.add(weaTableColumn);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|