|
|
|
|
@ -183,7 +183,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
|
|
|
|
|
String scopeId = columnName.split("_")[0];
|
|
|
|
|
String fieldName = columnName.substring(columnName.lastIndexOf("_") + 1);
|
|
|
|
|
WeaTableColumn weaTableColumn = new WeaTableColumn();
|
|
|
|
|
weaTableColumn.setText(getHrmResourceMapper().queryLabelName(fieldName, scopeId));
|
|
|
|
|
weaTableColumn.setText(getHrmResourceMapper().queryLabelName(fieldName, scopeId,user.getLanguage()));
|
|
|
|
|
weaTableColumn.setColumn(buildTableSql(columnName).replace(".", "_"));
|
|
|
|
|
|
|
|
|
|
weaTableColumn.setDisplay(columnList.contains(columnName) ? WeaBoolAttr.TRUE : WeaBoolAttr.FALSE);
|
|
|
|
|
@ -574,7 +574,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
|
|
|
|
|
topMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName("新建人员").type("BTN_Addnew").build());
|
|
|
|
|
rightMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName("新建人员").type("BTN_Addnew").build());
|
|
|
|
|
}
|
|
|
|
|
topMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("customization").menuIcon("icon-coms-task-list").menuName("列定制").type("BTN_COLUMN").build());
|
|
|
|
|
topMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("customization").menuIcon("icon-coms-task-list").menuName(SystemEnv.getHtmlLabelName(547136,user.getLanguage())).type("BTN_COLUMN").build());
|
|
|
|
|
rightMenuList.add(MenuBtn.rightMenu_btnLog(user.getLanguage()));
|
|
|
|
|
btnDatas.put("topMenu", topMenuList);
|
|
|
|
|
btnDatas.put("rightMenu", rightMenuList);
|
|
|
|
|
@ -588,64 +588,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
|
|
|
|
|
OrganizationAssert.notBlank(viewAttrStr, "未指定操作类型，请确认");
|
|
|
|
|
String id = Util.null2String(params.get("id"));
|
|
|
|
|
OrganizationAssert.notBlank(id, "数据有误，请确认");
|
|
|
|
|
int viewAttr = Integer.parseInt(viewAttrStr);
|
|
|
|
|
Map<String, Object> apiDatas = new HashMap<>();
|
|
|
|
|
|
|
|
|
|
//List<SearchConditionGroup> addGroups = new ArrayList<>();
|
|
|
|
|
//SearchConditionItem schemeId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "等级方案", "161", "schemeId", "schemeBrowser");
|
|
|
|
|
//schemeId.setRules("required");
|
|
|
|
|
//SearchConditionItem gradeId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "职级", "161", "gradeId", "gradeBrowser");
|
|
|
|
|
//gradeId.setRules("required");
|
|
|
|
|
//SearchConditionItem levelId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "职等", "162", "levelId", "levelBrowser");
|
|
|
|
|
//levelId.setRules("required");
|
|
|
|
|
//SearchConditionItem sequenceId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "岗位序列", "161", "sequenceId", "sequenceBrowser");
|
|
|
|
|
//sequenceId.setRules("required");
|
|
|
|
|
//SearchConditionItem postId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "职务分类", "161", "postId", "postBrowser");
|
|
|
|
|
//postId.setRules("required");
|
|
|
|
|
//SearchConditionItem postInfoId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "职务信息", "161", "postInfoId", "postInfoBrowser");
|
|
|
|
|
//postInfoId.setRules("required");
|
|
|
|
|
//SearchConditionItem companyId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "分部", "164", "companyId", "");
|
|
|
|
|
//companyId.setRules("required");
|
|
|
|
|
//SearchConditionItem departmentId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "部门", "4", "departmentId", "");
|
|
|
|
|
//departmentId.setRules("required");
|
|
|
|
|
//SearchConditionItem jobId = OrganizationFormItemUtil.browserItem(user, 2, 17, viewAttr, false, "岗位", "161", "jobId", "jobBrowser");
|
|
|
|
|
//jobId.setRules("required");
|
|
|
|
|
//
|
|
|
|
|
//
|
|
|
|
|
//// 编辑状态下赋值操作
|
|
|
|
|
//HrmRelationPO relationPO = getHrmRelationMapper().getRelationById(Long.parseLong(id));
|
|
|
|
|
//if (null != relationPO) {
|
|
|
|
|
// setBrowserValue(schemeId, relationPO.getSchemeId(), getSchemeMapper().listSchemesByIds(Stream.of(relationPO.getSchemeId()).collect(Collectors.toList())), null, null);
|
|
|
|
|
// setBrowserValue(gradeId, relationPO.getGradeId(), getGradeMapper().listGradessByIds(Stream.of(relationPO.getGradeId()).collect(Collectors.toList())), "scheme_id", relationPO.getSchemeId());
|
|
|
|
|
// setBrowserValue(levelId, relationPO.getLevelId(), getLevelMapper().listLevelsByIds(DeleteParam.builder().ids(relationPO.getLevelId()).build().getIds()), "grade_id", relationPO.getGradeId());
|
|
|
|
|
// setBrowserValue(sequenceId, relationPO.getSequenceId(), getSequenceMapper().listSequencesByIds(Stream.of(relationPO.getSequenceId()).collect(Collectors.toList())), "scheme_id", relationPO.getSchemeId());
|
|
|
|
|
// setBrowserValue(postId, relationPO.getPostId(), getPostMapper().listPostsByIds(Stream.of(relationPO.getPostId()).collect(Collectors.toList())), null, null);
|
|
|
|
|
// setBrowserValue(postInfoId, relationPO.getPostInfoId(), getPostInfoMapper().listPostInfosByIds(Stream.of(relationPO.getPostInfoId()).collect(Collectors.toList())), "post_id", relationPO.getPostId());
|
|
|
|
|
//
|
|
|
|
|
// List<Map<String, Object>> companyMaps = new ArrayList<>();
|
|
|
|
|
// String scCompanyNameById = MapperProxyFactory.getProxy(SystemDataMapper.class).getScCompanyNameById(relationPO.getCompanyId().toString());
|
|
|
|
|
// Map<String, Object> companyMap = new HashMap<>();
|
|
|
|
|
// companyMap.put(relationPO.getCompanyId().toString(), scCompanyNameById);
|
|
|
|
|
// companyMaps.add(companyMap);
|
|
|
|
|
// setBrowserValue(companyId, relationPO.getCompanyId(), companyMaps, null, null);
|
|
|
|
|
//
|
|
|
|
|
// List<Map<String, Object>> departmentMaps = new ArrayList<>();
|
|
|
|
|
// String departmentNameById = MapperProxyFactory.getProxy(SystemDataMapper.class).getScDepartmentNameById(relationPO.getDepartmentId().toString());
|
|
|
|
|
// Map<String, Object> departmentMap = new HashMap<>();
|
|
|
|
|
// departmentMap.put(relationPO.getDepartmentId().toString(), departmentNameById);
|
|
|
|
|
// departmentMaps.add(departmentMap);
|
|
|
|
|
// setBrowserValue(departmentId, relationPO.getDepartmentId(), departmentMaps, "subcompany1", relationPO.getCompanyId());
|
|
|
|
|
//
|
|
|
|
|
// setBrowserValue(jobId, relationPO.getJobId(), getJobMapper().listJobsByIds(Stream.of(relationPO.getJobId()).collect(Collectors.toList())), "departmentid", relationPO.getDepartmentId());
|
|
|
|
|
//}
|
|
|
|
|
//
|
|
|
|
|
//addGroups.add(new SearchConditionGroup("岗职位体系", true, Stream.of(schemeId, gradeId, levelId, sequenceId, postId, postInfoId).collect(Collectors.toList())));
|
|
|
|
|
//addGroups.add(new SearchConditionGroup("组织机构", true, Stream.of(companyId, departmentId, jobId).collect(Collectors.toList())));
|
|
|
|
|
//HashMap<String, Object> buttonsMap = new HashMap<>();
|
|
|
|
|
//buttonsMap.put("hasEdit", true);
|
|
|
|
|
//buttonsMap.put("hasSave", true);
|
|
|
|
|
//apiDatas.put("buttons", buttonsMap);
|
|
|
|
|
//apiDatas.put("conditions", addGroups);
|
|
|
|
|
return apiDatas;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -713,15 +656,6 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
|
|
|
|
|
tabInfoMap.put("selectedData", isUsedMap);
|
|
|
|
|
tabInfoMap.put("isModalEdit", false);
|
|
|
|
|
return tabInfoMap;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// OrganizationWeaTable<JclOrgCustomTemplateVO> table = new OrganizationWeaTable<>(user, JclOrgCustomTemplateVO.class);
|
|
|
|
|
// String sqlWhere = buildSqlWhere(params);
|
|
|
|
|
// table.setSqlwhere(sqlWhere);
|
|
|
|
|
// WeaResultMsg result = new WeaResultMsg(false);
|
|
|
|
|
// result.putAll(table.makeDataResult());
|
|
|
|
|
// result.success();
|
|
|
|
|
// return new HashMap<>(result.getResultMap());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
