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

Merge branch 'develop' of https://gitee.com/jmlcl/weaver-hrm-organization into feature/dxf

This commit is contained in:
dxfeng 2022-09-02 17:32:14 +08:00
parent 989526bc26 1042bee397
commit 337f8e51ed
11 changed files with 51 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/organization/entity/company/bo/CompBO.java
View File

@ -105,7 +105,7 @@ public class CompBO {
return comps.stream().map(item -> {
SearchTree tree = new SearchTree();
tree.setCanClick(true);
tree.setCanceled(false);
tree.setCanceled(item.getForbiddenTag() != 0);
tree.setIcon("icon-coms-LargeArea");
tree.setId(item.getId().toString());
tree.setIsParent(false);

2
src/com/engine/organization/entity/department/bo/DepartmentBO.java
View File

@ -127,7 +127,7 @@ public class DepartmentBO {
return departmentPOS.stream().map(item -> {
SearchTree tree = new SearchTree();
tree.setCanClick(true);
tree.setCanceled(false);
tree.setCanceled(item.getForbiddenTag() != 0);
tree.setIcon(isLeaf ? "icon-coms-Branch" : "icon-coms-LargeArea");
tree.setId(item.getId().toString());
tree.setIsParent(false);

4
src/com/engine/organization/entity/postion/vo/PostInfoTableVO.java
View File

@ -78,12 +78,12 @@ public class PostInfoTableVO {
/**
* 说明
*/
@OrganizationTableColumn(text = "说明", width = "20%", column = "description")
@OrganizationTableColumn(text = "说明", width = "30%", column = "description")
private String description;
/**
* 禁用标记
*/
@OrganizationTableColumn(text = "是否启用", width = "20%", column = "forbidden_tag")
@OrganizationTableColumn(text = "是否启用", width = "10%", column = "forbidden_tag")
private Integer forbiddenTag;
}

13
src/com/engine/organization/entity/scheme/vo/GradeTableVO.java
View File

@ -60,11 +60,7 @@ public class GradeTableVO {
*/
@OrganizationTableColumn(text = "名称", width = "20%", column = "grade_name")
private String gradeName;
/**
* 描述说明
*/
@OrganizationTableColumn(text = "描述说明", width = "20%", column = "description")
private String description;
/**
* 等级方案
*/
@ -80,9 +76,14 @@ public class GradeTableVO {
@OrganizationTableColumn(text = "职等", width = "20%", column = "level_id", transmethod = "com.engine.organization.transmethod.LevelTransMethod.getLevelId")
private String levelId;
/**
* 描述说明
*/
@OrganizationTableColumn(text = "描述说明", width = "30%", column = "description")
private String description;
/**
* 禁用标记
*/
@OrganizationTableColumn(text = "是否启用", width = "20%", column = "forbidden_tag")
@OrganizationTableColumn(text = "是否启用", width = "10%", column = "forbidden_tag")
private int forbiddenTag;
}

15
src/com/engine/organization/entity/scheme/vo/LevelTableVO.java
View File

@ -59,21 +59,22 @@ public class LevelTableVO {
@OrganizationTableColumn(text = "名称", width = "20%", column = "level_name")
private String levelName;
/**
* 描述说明
*/
@OrganizationTableColumn(text = "描述说明", width = "20%", column = "description")
private String description;
/**
* 等级方案
*/
@OrganizationTableColumn(text = "等级方案", width = "20%", column = "scheme_name")
private String schemeName;
/**
* 描述说明
*/
@OrganizationTableColumn(text = "描述说明", width = "30%", column = "description")
private String description;
/**
* 禁用标记
*/
@OrganizationTableColumn(text = "是否启用", width = "20%", column = "forbidden_tag")
@OrganizationTableColumn(text = "是否启用", width = "10%", column = "forbidden_tag")
private Integer forbiddenTag;
}

4
src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java
View File

@ -61,12 +61,12 @@ public class SchemeTableVO {
/**
* 方案描述
*/
@OrganizationTableColumn(text = "方案说明", width = "25%", column = "scheme_description")
@OrganizationTableColumn(text = "方案说明", width = "40%", column = "scheme_description")
private String schemeDescription;
/**
* 禁用标识
*/
@OrganizationTableColumn(text = "是否启用", width = "25%", column = "forbidden_tag")
@OrganizationTableColumn(text = "是否启用", width = "10%", column = "forbidden_tag")
private Integer forbiddenTag;
}

13
src/com/engine/organization/entity/sequence/vo/SequenceTableVO.java
View File

@ -65,11 +65,6 @@ public class SequenceTableVO {
@OrganizationTableColumn(text = "名称", width = "20%", column = "sequence_name")
private String sequenceName;
/**
* 描述说明
*/
@OrganizationTableColumn(text = "描述说明", width = "20%", column = "description")
private String description;
/**
* 等级方案
@ -77,9 +72,15 @@ public class SequenceTableVO {
@OrganizationTableColumn(text = "等级方案", width = "20%", column = "scheme_name")
private String schemeName;
/**
* 描述说明
*/
@OrganizationTableColumn(text = "描述说明", width = "30%", column = "description")
private String description;
/**
* 禁用标记
*/
@OrganizationTableColumn(text = "是否启用", width = "20%", column = "forbidden_tag")
@OrganizationTableColumn(text = "是否启用", width = "10%", column = "forbidden_tag")
private Integer forbiddenTag;
}

2
src/com/engine/organization/mapper/scheme/SchemeMapper.xml
View File

@ -76,7 +76,7 @@
<select id="getTreeData" resultMap="TreeResultMap">
select id, scheme_name
from jcl_org_scheme
where delete_type = '0'
where delete_type = '0' and forbidden_tag = 0
</select>
<select id="getSchemesByIds" resultMap="BaseResultMap">
select

11
src/com/engine/organization/service/impl/GradeServiceImpl.java
View File

@ -127,6 +127,8 @@ public class GradeServiceImpl extends Service implements GradeService {
Map<String, Object> apiDatas = new HashMap<>();
List<SearchConditionItem> selectItems = new ArrayList<>();
List<SearchConditionGroup> addGroups = new ArrayList<>();
String id = Util.null2String(params.get("id"));
String schemeId = Util.null2String(params.get("schemeId"));
SearchConditionItem gradeNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "名称", "gradeName");
gradeNameCondition.setRules("required|string");
SearchConditionItem gradeNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "编号", "gradeNo");
@ -134,11 +136,17 @@ public class GradeServiceImpl extends Service implements GradeService {
SearchConditionItem descriptionCondition = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 60, "描述说明", "description");
SearchConditionItem schemeBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "等级方案", "161", "schemeId", "schemeBrowser");
schemeBrowserItem.setRules("required|string");
BrowserBean schemeBrowserBean = schemeBrowserItem.getBrowserConditionParam();
if (!"-1".equals(schemeId) && StringUtil.isEmpty(id)) {
schemeBrowserBean.setValue(schemeId);
List<Map<String, Object>> maps = getSchemeMapper().listSchemesByIds(DeleteParam.builder().ids(schemeId).build().getIds());
schemeBrowserBean.setReplaceDatas(maps);
schemeBrowserItem.setBrowserConditionParam(schemeBrowserBean);
}
SearchConditionItem levelBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "职等", "162", "levelId", "LevelBrowser");
levelBrowserItem.setRules("required|string");
// 编辑状态下赋值操作
String id = Util.null2String(params.get("id"));
if (!StringUtil.isEmpty(id)) {
GradePO gradePO = getGradeMapper().getGradeByID(Integer.parseInt(id));
OrganizationAssert.notNull(gradePO, "选择的数据不存在，或数据已删除");
@ -149,7 +157,6 @@ public class GradeServiceImpl extends Service implements GradeService {
schemeBrowserItem.setValue(gradePO.getSchemeId());
levelBrowserItem.setValue(gradePO.getLevelId());
BrowserBean schemeBrowserBean = schemeBrowserItem.getBrowserConditionParam();
List<Map<String, Object>> schemeMaps = getSchemeMapper().listSchemesByIds(DeleteParam.builder().ids(gradePO.getSchemeId().toString()).build().getIds());
schemeBrowserBean.setReplaceDatas(schemeMaps);
schemeBrowserItem.setBrowserConditionParam(schemeBrowserBean);

11
src/com/engine/organization/service/impl/LevelServiceImpl.java
View File

@ -124,15 +124,23 @@ public class LevelServiceImpl extends Service implements LevelService {
Map<String, Object> apiDatas = new HashMap<>();
List<SearchConditionItem> selectItems = new ArrayList<>();
List<SearchConditionGroup> addGroups = new ArrayList<>();
String id = Util.null2String(params.get("id"));
String schemeId = Util.null2String(params.get("schemeId"));
SearchConditionItem levelNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "名称", "levelName");
levelNameCondition.setRules("required|string");
SearchConditionItem levelNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "编号", "levelNo");
levelNoCondition.setRules("required|string");
SearchConditionItem descriptionCondition = OrganizationFormItemUtil.textareaItem(user, 2, 17, true, 2, 60, "描述说明", "description");
SearchConditionItem browserItem = OrganizationFormItemUtil.browserItem(user, 2, 17, 3, false, "等级方案", "161", "schemeId", "schemeBrowser");
BrowserBean browserBean = browserItem.getBrowserConditionParam();
if (!"-1".equals(schemeId) && StringUtil.isEmpty(id)) {
browserItem.setValue(schemeId);
List<Map<String, Object>> maps = getSchemeMapper().listSchemesByIds(DeleteParam.builder().ids(schemeId).build().getIds());
browserBean.setReplaceDatas(maps);
browserItem.setBrowserConditionParam(browserBean);
}
browserItem.setRules("required|string");
// 编辑状态下赋值操作
String id = Util.null2String(params.get("id"));
if (!StringUtil.isEmpty(id)) {
LevelPO levelPO = getLevelMapper().getLevelByID(Integer.parseInt(id));
OrganizationAssert.notNull(levelPO, "选择的数据不存在，或数据已删除");
@ -142,7 +150,6 @@ public class LevelServiceImpl extends Service implements LevelService {
descriptionCondition.setValue(levelPO.getDescription());
browserItem.setValue(levelPO.getSchemeId());
BrowserBean browserBean = browserItem.getBrowserConditionParam();
List<Map<String, Object>> maps = getSchemeMapper().listSchemesByIds(DeleteParam.builder().ids(levelPO.getSchemeId().toString()).build().getIds());
browserBean.setReplaceDatas(maps);

4
src/com/engine/organization/wrapper/SchemeWrapper.java
View File

@ -136,6 +136,10 @@ public class SchemeWrapper extends OrganizationWrapper {
return getSchemeService(user).getTableBtn();
}
/**
* 等级方案树
* @return
*/
public List<TypeTreeVO> getTreeData() {
return getSchemeService(user).getTreeData();
}