显示定制列穿梭框接口开发

pull/137/head
dxfeng 2 years ago
parent 70438b649a
commit a7b1f33e1a

@ -136,7 +136,7 @@
where id = #{id}
</select>
<select id="getCustomTemplatesByUser"
resultType="com.engine.organization.entity.hrmresource.param.SearchTemplateParam">
resultMap="SearchTemplateMap">
select id,
name,
'false' as selected

@ -235,7 +235,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
Map<String, Object> resultMap = new HashMap<>();
String templateId = StringUtils.isNotBlank(Util.null2String(params.get("templateId"))) ? Util.null2String(params.get("templateId")) : "-1";
List<TransferDataPO> transferDatas = new ArrayList<>();
List<String> transferKeys = new ArrayList<>();
List<String> transferKeys;
List<SearchTemplateParam> transferOptions = new ArrayList<>();
List<SearchConditionGroup> allConditions = getAllConditions();
AtomicInteger idx = new AtomicInteger(0);
@ -567,7 +567,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
String parentDeptS = jobTrees.stream().map(SearchTree::getParentComp).collect(Collectors.joining(","));
if (!StringUtil.isEmpty(parentDeptS)) {
// 兼容SQLServer每次最多in,2100条数据
List<Long> ids = (List<Long>) DeleteParam.builder().ids(parentDeptS).build().getIds();
List<Long> ids = DeleteParam.builder().ids(parentDeptS).build().getIds();
int ceilCount = (int) Math.ceil((double) ids.size() / 1000);
List<DepartmentPO> departmentsByIds = new ArrayList<>();
for (int i = 0; i < ceilCount - 1; i++) {
@ -858,13 +858,17 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
// 模糊搜索
break;
case INPUTNUMBER:// 数字
case SELECT://选择框
case BROWSER://浏览按钮
// 兼容多选浏览按钮
sb.append(" and ").append(dbType.concat(tableSql)).append(dbType.like(value));
break;
case INPUTNUMBER:// 数字
case CHECKBOX:
case SWITCH:
sb.append(" and ").append(dbType.ifNull(tableSql, "0")).append(" = '").append(value).append("' ");
break;
case SELECT://选择框
case DATE:
case DATEPICKER:
case TIMEPICKER:
@ -922,11 +926,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
private void addEmptyForSelect(SearchConditionItem searchConditionItem) {
searchConditionItem.setValue("");
List<SearchConditionOption> options = searchConditionItem.getOptions();
options.forEach(item -> {
item.setSelected(false);
});
SearchConditionOption searchConditionOption = new SearchConditionOption();
searchConditionOption.setSelected(true);
searchConditionOption.setKey("");
options.add(0, searchConditionOption);

Loading…
Cancel
Save