liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

测试

This commit is contained in:
Chengliang 2023-08-16 13:49:10 +08:00
parent 0898759845
commit 01dc480720
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
View File

@ -1153,6 +1153,9 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
case INPUTNUMBER:// 数字
if (isQuickSearch) {
if ("-1".equals(value)){
break;
}
QuickSearchDetail quickSearchDetailById = getQuickSearchMapper().getQuickSearchDetailById(value);
Integer maxNum = quickSearchDetailById.getMaxNum();
Integer minNum = quickSearchDetailById.getMinNum();

6
src/com/engine/organization/service/impl/QuickSearchServiceImpl.java
View File

@ -71,6 +71,7 @@ public class QuickSearchServiceImpl extends Service implements QuickSearchServic
} else {
// 字段本身值、判断有无下拉框选项
List<ConditionOption> options = selectOptions.stream().map(item -> ConditionOption.builder().key(item.getKey()).showname(item.getShowname()).build()).collect(Collectors.toList());
options.add(0,ConditionOption.builder().key("-1").showname("全部").build());
condition.setOptions(options);
}
rangeConditions.add(condition);
@ -99,10 +100,13 @@ public class QuickSearchServiceImpl extends Service implements QuickSearchServic
case 1:
// 整数-浮点数
List<QuickSearchDetail> quickSearchDetailList = getQuickSearchMapper().getQuickSearchDetailByCid(quickSearchCondition.getId().toString());
if (CollectionUtils.isEmpty(quickSearchDetailList)) {
condition.setCom("未设置选项");
} else {
condition.setOptions(quickSearchDetailList.stream().map(item -> ConditionOption.builder().key(item.getId().toString()).showname(item.getCustomName()).build()).collect(Collectors.toList()));
List<ConditionOption> collect = quickSearchDetailList.stream().map(item -> ConditionOption.builder().key(item.getId().toString()).showname(item.getCustomName()).build()).collect(Collectors.toList());
collect.add(0,ConditionOption.builder().key("-1").showname("全部").build());
condition.setOptions(collect);
}
rangeConditions.add(condition);
break;