From 8da146b4489f092a63f8ce6a02c82daa0402974d Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 31 May 2022 11:17:03 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/entity/company/dto/CompListDTO.java | 6 ------ .../entity/department/dto/DepartmentListDTO.java | 6 +++++- .../organization/service/impl/JobServiceImpl.java | 10 ++++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/com/engine/organization/entity/company/dto/CompListDTO.java b/src/com/engine/organization/entity/company/dto/CompListDTO.java index 73e9e464..ab102b77 100644 --- a/src/com/engine/organization/entity/company/dto/CompListDTO.java +++ b/src/com/engine/organization/entity/company/dto/CompListDTO.java @@ -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 children; - - private Long creator; - private int deleteType; - private Date createTime; - private Date updateTime; } diff --git a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java index 1731a5da..27f4ad5a 100644 --- a/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java +++ b/src/com/engine/organization/entity/department/dto/DepartmentListDTO.java @@ -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; /** * 子节点 */ diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index 0fd7efbd..4520d072 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -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 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; } From 53c95d77dca365eb7c428e044863fbeb01ea2d17 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 31 May 2022 11:49:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E8=A1=A8=E5=8D=95?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/service/impl/JobServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index 4520d072..848b600c 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -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"); // 是否关键岗 @@ -293,14 +293,14 @@ 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); conditionItems.add(parentCompBrowserItem); conditionItems.add(parentDeptBrowserItem); conditionItems.add(sequenceBrowserItem); - // conditionItems.add(schemeBrowserItem); + conditionItems.add(schemeBrowserItem); conditionItems.add(parentJobBrowserItem); conditionItems.add(isKeyItem); @@ -628,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"); // 工作概述 @@ -642,6 +643,7 @@ 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,8 +699,6 @@ public class JobServiceImpl extends Service implements JobService { for (SearchConditionItem item : conditionItems) { item.setViewAttr(viewAttr); } - // 查看状态下展示 - conditionItems.add(schemeBrowserItem); } return conditionItems; }