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

岗位表单更改

This commit is contained in:
dxfeng 2022-05-31 11:17:03 +08:00
parent 04c7ec175f
commit 8da146b448
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/engine/organization/entity/company/dto/CompListDTO.java
View File

@ -9,7 +9,6 @@ import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
import java.util.List;
/**
@ -95,9 +94,4 @@ public class CompListDTO {
* 子节点
*/
private List<CompListDTO> children;
private Long creator;
private int deleteType;
private Date createTime;
private Date updateTime;
}

6
src/com/engine/organization/entity/department/dto/DepartmentListDTO.java
View File

@ -90,7 +90,11 @@ public class DepartmentListDTO {
*/
@TableTitle(title = "禁用标记", dataIndex = "forbiddenTag", key = "forbiddenTag")
private int forbiddenTag;
/**
* 操作列
*/
@TableTitle(title = "", dataIndex = "operate", key = "operate")
private String operate;
/**
* 子节点
*/

10
src/com/engine/organization/service/impl/JobServiceImpl.java
View File

@ -283,7 +283,7 @@ public class JobServiceImpl extends Service implements JobService {
// 岗位序列
SearchConditionItem sequenceBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "岗位序列", "161", "sequenceId", "sequenceBrowser");
// 等级方案
SearchConditionItem schemeBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "等级方案", "161", "schemeId", "schemeBrowser");
//SearchConditionItem schemeBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "等级方案", "161", "schemeId", "schemeBrowser");
// 上级岗位
SearchConditionItem parentJobBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "上级岗位", "161", "parentJob", "jobBrowser");
// 是否关键岗
@ -300,7 +300,7 @@ public class JobServiceImpl extends Service implements JobService {
conditionItems.add(parentCompBrowserItem);
conditionItems.add(parentDeptBrowserItem);
conditionItems.add(sequenceBrowserItem);
conditionItems.add(schemeBrowserItem);
// conditionItems.add(schemeBrowserItem);
conditionItems.add(parentJobBrowserItem);
conditionItems.add(isKeyItem);
@ -349,6 +349,7 @@ public class JobServiceImpl extends Service implements JobService {
List<JobPO> list = getJobMapper().listByNo(Util.null2String(params.getJobNo()));
OrganizationAssert.isEmpty(list, "编号不允许重复");
JobPO jobPO = JobBO.convertParamsToPO(params, (long) user.getUID());
// 设置对应的等级方案
return getJobMapper().insertIgnoreNull(jobPO);
}
@ -617,7 +618,7 @@ public class JobServiceImpl extends Service implements JobService {
// 岗位序列
SearchConditionItem sequenceBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "岗位序列", "161", "sequenceId", "sequenceBrowser");
// 等级方案
SearchConditionItem schemeBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "等级方案", "161", "schemeId", "schemeBrowser");
SearchConditionItem schemeBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 1, false, "等级方案", "161", "schemeId", "schemeBrowser");
// 上级岗位
SearchConditionItem parentJobBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "上级岗位", "161", "parentJob", "jobBrowser");
// 是否关键岗
@ -641,7 +642,6 @@ public class JobServiceImpl extends Service implements JobService {
conditionItems.add(parentCompBrowserItem);
conditionItems.add(parentDeptBrowserItem);
conditionItems.add(sequenceBrowserItem);
conditionItems.add(schemeBrowserItem);
conditionItems.add(parentJobBrowserItem);
conditionItems.add(isKeyItem);
conditionItems.add(workplaceItem);
@ -697,6 +697,8 @@ public class JobServiceImpl extends Service implements JobService {
for (SearchConditionItem item : conditionItems) {
item.setViewAttr(viewAttr);
}
// 查看状态下展示
conditionItems.add(schemeBrowserItem);
}
return conditionItems;
}