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

!35 岗位表单更改 

Merge pull request !35 from dxfeng/feature/dxf
This commit is contained in:
dxfeng 2022-05-31 03:56:10 +00:00 committed by Gitee
parent 3520b36224 53c95d77dc
commit 1a0c403991
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 9 additions and 9 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;
/**
* 子节点
*/

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

@ -293,7 +293,7 @@ public class JobServiceImpl extends Service implements JobService {
isKeyOptions.add(yesOption);
isKeyOptions.add(noOption);
SearchConditionItem isKeyItem = OrganizationFormItemUtil.selectItem(user, isKeyOptions, 2, 16, 6, false, "是否关键岗", "forbiddenTag");
isKeyItem.setDetailtype(2);
isKeyItem.setDetailtype(3);
conditionItems.add(jobNoItem);
conditionItems.add(jobNameItem);
@ -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");
// 是否关键岗
@ -627,6 +628,7 @@ public class JobServiceImpl extends Service implements JobService {
isKeyOptions.add(yesOption);
isKeyOptions.add(noOption);
SearchConditionItem isKeyItem = OrganizationFormItemUtil.selectItem(user, isKeyOptions, 2, 16, 6, false, "禁用标记", "forbiddenTag");
isKeyItem.setDetailtype(3);
// 工作地点
SearchConditionItem workplaceItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "工作地点", "workplace");
// 工作概述