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

Merge pull request '显示定制列穿梭框接口开发' (#137) from feature/dxf into develop 

Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/137
This commit is contained in:
dxfeng 2023-01-12 14:14:52 +08:00
parent 044f963f31 cb814ef077
commit 7d96731841
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/organization/mapper/resource/HrmResourceMapper.xml
View File

@ -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

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

@ -259,7 +259,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);
@ -633,7 +633,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++) {
@ -924,13 +924,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:
@ -988,14 +992,12 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
private void addEmptyForSelect(SearchConditionItem searchConditionItem) {
searchConditionItem.setValue("");
List<SearchConditionOption> options = searchConditionItem.getOptions();
SearchConditionOption searchConditionOption = new SearchConditionOption();
searchConditionOption.setKey("");
options.add(0, searchConditionOption);
options.forEach(item -> {
item.setSelected(false);
});
SearchConditionOption searchConditionOption = new SearchConditionOption();
searchConditionOption.setSelected(true);
searchConditionOption.setKey("");
options.add(0, searchConditionOption);
}
/**