From d1dcc9d563ace93efbebef507ff537693480c287 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Wed, 1 Jun 2022 14:38:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E5=A4=8D=E5=88=B6=E5=92=8C?= =?UTF-8?q?=E8=81=94=E6=9F=A5=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{QueryParam.java => DeleteParam.java} | 2 +- .../entity/employee/vo/EmployeeTableVO.java | 43 +++++++++++++++++++ .../entity/employee/vo/EmployeeVO.java | 30 ------------- .../organization/service/JobService.java | 1 + .../service/impl/GradeServiceImpl.java | 6 +-- .../service/impl/JobServiceImpl.java | 26 +++++++---- .../service/impl/LevelServiceImpl.java | 4 +- .../service/impl/PostInfoServiceImpl.java | 4 +- .../service/impl/SequenceServiceImpl.java | 4 +- .../service/impl/StaffPlanServiceImpl.java | 4 +- .../service/impl/StaffServiceImpl.java | 10 ++--- .../transmethod/CompTransMethod.java | 4 +- .../transmethod/DepartmentTransMethod.java | 4 +- .../transmethod/JobTransMethod.java | 2 +- .../transmethod/LevelTransMethod.java | 4 +- .../transmethod/StaffPlanTransMethod.java | 4 +- .../organization/web/CompController.java | 4 +- .../web/DepartmentController.java | 4 +- .../organization/web/GradeController.java | 4 +- .../organization/web/JobController.java | 36 +++++++++++++--- .../organization/web/LevelController.java | 4 +- .../organization/web/PostController.java | 4 +- .../organization/web/PostInfoController.java | 4 +- .../organization/web/SchemeController.java | 4 +- .../organization/web/SequenceController.java | 4 +- .../organization/web/StaffController.java | 4 +- .../organization/web/StaffPlanController.java | 4 +- .../organization/wrapper/JobWrapper.java | 26 +++++++++++ 28 files changed, 164 insertions(+), 90 deletions(-) rename src/com/engine/organization/entity/{QueryParam.java => DeleteParam.java} (96%) create mode 100644 src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java delete mode 100644 src/com/engine/organization/entity/employee/vo/EmployeeVO.java diff --git a/src/com/engine/organization/entity/QueryParam.java b/src/com/engine/organization/entity/DeleteParam.java similarity index 96% rename from src/com/engine/organization/entity/QueryParam.java rename to src/com/engine/organization/entity/DeleteParam.java index 31b6c31d..422a8735 100644 --- a/src/com/engine/organization/entity/QueryParam.java +++ b/src/com/engine/organization/entity/DeleteParam.java @@ -22,7 +22,7 @@ import java.util.stream.Collectors; @Builder @NoArgsConstructor @AllArgsConstructor -public class QueryParam { +public class DeleteParam { private String ids; public Collection getIds() { diff --git a/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java b/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java new file mode 100644 index 00000000..b493b975 --- /dev/null +++ b/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java @@ -0,0 +1,43 @@ +package com.engine.organization.entity.employee.vo; + +/** + * @description: TODO + * @author:dxfeng + * @createTime: 2022/05/31 + * @version: 1.0 + */ + +import com.cloudstore.eccom.pc.table.WeaTableType; +import com.engine.organization.annotation.OrganizationTable; +import com.engine.organization.annotation.OrganizationTableColumn; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@OrganizationTable(pageId = "80e7830c-18e8-4e14-8241-18821195ef31", + fields = "t.id," + + "t.lastname," + + "t.sex", + fromSql = "FROM HrmResource t ", + orderby = "id desc", + primarykey = "id", + tableType = WeaTableType.NONE +) +public class EmployeeTableVO { + + @OrganizationTableColumn(column = "id", display = false) + private Long id; + + @OrganizationTableColumn(text = "姓名", width = "50%", column = "lastname") + private String lastname; + + @OrganizationTableColumn(text = "性别", width = "50%", column = "sex") + private String sex; + + +} diff --git a/src/com/engine/organization/entity/employee/vo/EmployeeVO.java b/src/com/engine/organization/entity/employee/vo/EmployeeVO.java deleted file mode 100644 index 9db19162..00000000 --- a/src/com/engine/organization/entity/employee/vo/EmployeeVO.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.engine.organization.entity.employee.vo; - -/** - * @description: TODO - * @author:dxfeng - * @createTime: 2022/05/31 - * @version: 1.0 - */ -public class EmployeeVO { - /** - * 名称 - */ - private String username; - - /** - * 分部 - */ - private String companyName; - - /** - * 部门 - */ - private String departmentName; - - /** - * 直接上级 - */ - private String manager; - -} diff --git a/src/com/engine/organization/service/JobService.java b/src/com/engine/organization/service/JobService.java index 6b531f38..68a86ebf 100644 --- a/src/com/engine/organization/service/JobService.java +++ b/src/com/engine/organization/service/JobService.java @@ -97,4 +97,5 @@ public interface JobService { */ int deleteByIds(Collection ids); + Map getHrmListByJobId(Long jobId); } diff --git a/src/com/engine/organization/service/impl/GradeServiceImpl.java b/src/com/engine/organization/service/impl/GradeServiceImpl.java index 6e95382c..e1accf47 100644 --- a/src/com/engine/organization/service/impl/GradeServiceImpl.java +++ b/src/com/engine/organization/service/impl/GradeServiceImpl.java @@ -6,7 +6,7 @@ import com.api.browser.bean.SearchConditionItem; import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.core.impl.Service; import com.engine.organization.component.OrganizationWeaTable; -import com.engine.organization.entity.QueryParam; +import com.engine.organization.entity.DeleteParam; import com.engine.organization.entity.TopTab; import com.engine.organization.entity.scheme.dto.GradeDTO; import com.engine.organization.entity.scheme.param.GradeSearchParam; @@ -131,12 +131,12 @@ public class GradeServiceImpl extends Service implements GradeService { levelBrowserItem.setValue(gradePO.getLevelId()); BrowserBean schemeBrowserBean = schemeBrowserItem.getBrowserConditionParam(); - List> schemeMaps = getSchemeMapper().listSchemesByIds(QueryParam.builder().ids(gradePO.getSchemeId().toString()).build().getIds()); + List> schemeMaps = getSchemeMapper().listSchemesByIds(DeleteParam.builder().ids(gradePO.getSchemeId().toString()).build().getIds()); schemeBrowserBean.setReplaceDatas(schemeMaps); schemeBrowserItem.setBrowserConditionParam(schemeBrowserBean); BrowserBean levelBrowserBean = levelBrowserItem.getBrowserConditionParam(); - List> levelMaps = getLevelMapper().listLevelsByIds(QueryParam.builder().ids(gradePO.getLevelId()).build().getIds()); + List> levelMaps = getLevelMapper().listLevelsByIds(DeleteParam.builder().ids(gradePO.getLevelId()).build().getIds()); levelBrowserBean.setReplaceDatas(levelMaps); levelBrowserItem.setBrowserConditionParam(levelBrowserBean); diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index a4e9c691..7873ca5f 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -11,12 +11,13 @@ import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.organization.component.OrganizationWeaTable; -import com.engine.organization.entity.QueryParam; +import com.engine.organization.entity.DeleteParam; import com.engine.organization.entity.company.bo.CompBO; import com.engine.organization.entity.company.po.CompPO; import com.engine.organization.entity.department.bo.DepartmentBO; import com.engine.organization.entity.department.dto.DepartmentListDTO; import com.engine.organization.entity.department.po.DepartmentPO; +import com.engine.organization.entity.employee.vo.EmployeeTableVO; import com.engine.organization.entity.extend.bo.ExtendInfoBO; import com.engine.organization.entity.extend.po.ExtendInfoPO; import com.engine.organization.entity.job.bo.JobBO; @@ -387,7 +388,7 @@ public class JobServiceImpl extends Service implements JobService { // 根据等级方案查询职等、职级 List gradePOS = MapperProxyFactory.getProxy(GradeMapper.class).listGradesBySchemeId(jobPO.getSchemeId()); for (GradePO gradePO : gradePOS) { - List> maps = MapperProxyFactory.getProxy(LevelMapper.class).listLevelsByIds(QueryParam.builder().ids(gradePO.getLevelId()).build().getIds()); + List> maps = MapperProxyFactory.getProxy(LevelMapper.class).listLevelsByIds(DeleteParam.builder().ids(gradePO.getLevelId()).build().getIds()); String levelNames = maps.stream().map(item -> (String) item.get("name")).collect(Collectors.joining(",")); insertCount += getJobDTMapper().insertIgnoreNull(JobDTPO.builder().levelId(gradePO.getLevelId()).gradeId(gradePO.getId() + "").levelIdspan(levelNames).gradeIdspan(gradePO.getGradeName()).mainId(jobPO.getId()).creator((long) user.getUID()).deleteType(0).createTime(new Date()).updateTime(new Date()).build()); } @@ -444,6 +445,15 @@ public class JobServiceImpl extends Service implements JobService { return getJobMapper().deleteByIds(deleteIds); } + @Override + public Map getHrmListByJobId(Long jobId) { + OrganizationWeaTable table = new OrganizationWeaTable<>(user, EmployeeTableVO.class); + WeaResultMsg result = new WeaResultMsg(false); + result.putAll(table.makeDataResult()); + result.success(); + return result.getResultMap(); + } + /** * 添加查询元素的父级元素 * @@ -557,7 +567,7 @@ public class JobServiceImpl extends Service implements JobService { // 添加部门的上级分部 String parentCompS = deptTrees.stream().map(SearchTree::getParentComp).collect(Collectors.joining(",")); if (!StringUtil.isEmpty(parentCompS)) { - List compsByIds = getCompMapper().getCompsByIds(QueryParam.builder().ids(parentCompS).build().getIds()); + List compsByIds = getCompMapper().getCompsByIds(DeleteParam.builder().ids(parentCompS).build().getIds()); if (CollectionUtils.isNotEmpty(compsByIds)) { filterComps.addAll(compsByIds); } @@ -730,31 +740,31 @@ public class JobServiceImpl extends Service implements JobService { if (null != jobPO.getParentComp()) { BrowserBean browserBean = parentCompBrowserItem.getBrowserConditionParam(); - List> compMaps = getCompMapper().listCompsByIds(QueryParam.builder().ids(jobPO.getParentComp().toString()).build().getIds()); + List> compMaps = getCompMapper().listCompsByIds(DeleteParam.builder().ids(jobPO.getParentComp().toString()).build().getIds()); browserBean.setReplaceDatas(compMaps); parentCompBrowserItem.setBrowserConditionParam(browserBean); } if (null != jobPO.getParentDept()) { BrowserBean browserBean = parentDeptBrowserItem.getBrowserConditionParam(); - List> deptMaps = getDepartmentMapper().listDeptsByIds(QueryParam.builder().ids(jobPO.getParentDept().toString()).build().getIds()); + List> deptMaps = getDepartmentMapper().listDeptsByIds(DeleteParam.builder().ids(jobPO.getParentDept().toString()).build().getIds()); browserBean.setReplaceDatas(deptMaps); parentDeptBrowserItem.setBrowserConditionParam(browserBean); } if (null != jobPO.getSequenceId()) { BrowserBean browserBean = sequenceBrowserItem.getBrowserConditionParam(); - List> deptMaps = getSequenceMapper().listSequencesByIds(QueryParam.builder().ids(jobPO.getSequenceId().toString()).build().getIds()); + List> deptMaps = getSequenceMapper().listSequencesByIds(DeleteParam.builder().ids(jobPO.getSequenceId().toString()).build().getIds()); browserBean.setReplaceDatas(deptMaps); sequenceBrowserItem.setBrowserConditionParam(browserBean); } if (null != jobPO.getSchemeId()) { BrowserBean browserBean = schemeBrowserItem.getBrowserConditionParam(); - List> deptMaps = getSchemeMapper().listSchemesByIds(QueryParam.builder().ids(jobPO.getSchemeId().toString()).build().getIds()); + List> deptMaps = getSchemeMapper().listSchemesByIds(DeleteParam.builder().ids(jobPO.getSchemeId().toString()).build().getIds()); browserBean.setReplaceDatas(deptMaps); schemeBrowserItem.setBrowserConditionParam(browserBean); } if (null != jobPO.getParentJob()) { BrowserBean browserBean = parentJobBrowserItem.getBrowserConditionParam(); - List> deptMaps = getJobMapper().listJobsByIds(QueryParam.builder().ids(jobPO.getParentJob().toString()).build().getIds()); + List> deptMaps = getJobMapper().listJobsByIds(DeleteParam.builder().ids(jobPO.getParentJob().toString()).build().getIds()); browserBean.setReplaceDatas(deptMaps); schemeBrowserItem.setBrowserConditionParam(browserBean); } diff --git a/src/com/engine/organization/service/impl/LevelServiceImpl.java b/src/com/engine/organization/service/impl/LevelServiceImpl.java index 3ea178ce..1f99a9f9 100644 --- a/src/com/engine/organization/service/impl/LevelServiceImpl.java +++ b/src/com/engine/organization/service/impl/LevelServiceImpl.java @@ -6,7 +6,7 @@ import com.api.browser.bean.SearchConditionItem; import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.core.impl.Service; import com.engine.organization.component.OrganizationWeaTable; -import com.engine.organization.entity.QueryParam; +import com.engine.organization.entity.DeleteParam; import com.engine.organization.entity.TopTab; import com.engine.organization.entity.scheme.dto.LevelDTO; import com.engine.organization.entity.scheme.param.LevelSearchParam; @@ -123,7 +123,7 @@ public class LevelServiceImpl extends Service implements LevelService { browserItem.setValue(levelPO.getSchemeId()); BrowserBean browserBean = browserItem.getBrowserConditionParam(); - List> maps = getSchemeMapper().listSchemesByIds(QueryParam.builder().ids(levelPO.getSchemeId().toString()).build().getIds()); + List> maps = getSchemeMapper().listSchemesByIds(DeleteParam.builder().ids(levelPO.getSchemeId().toString()).build().getIds()); browserBean.setReplaceDatas(maps); browserItem.setBrowserConditionParam(browserBean); diff --git a/src/com/engine/organization/service/impl/PostInfoServiceImpl.java b/src/com/engine/organization/service/impl/PostInfoServiceImpl.java index 2eb1e1f0..1c27612e 100644 --- a/src/com/engine/organization/service/impl/PostInfoServiceImpl.java +++ b/src/com/engine/organization/service/impl/PostInfoServiceImpl.java @@ -6,7 +6,7 @@ import com.api.browser.bean.SearchConditionItem; import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.core.impl.Service; import com.engine.organization.component.OrganizationWeaTable; -import com.engine.organization.entity.QueryParam; +import com.engine.organization.entity.DeleteParam; import com.engine.organization.entity.postion.dto.PostInfoDTO; import com.engine.organization.entity.postion.param.PostInfoSearchParam; import com.engine.organization.entity.postion.po.PostInfoPO; @@ -135,7 +135,7 @@ public class PostInfoServiceImpl extends Service implements PostInfoService { descriptionItem.setValue(postInfoPO.getDescription()); BrowserBean browserBean = postIdBrowser.getBrowserConditionParam(); - List> maps = getPostMapper().listPostsByIds(QueryParam.builder().ids(postInfoPO.getPostId().toString()).build().getIds()); + List> maps = getPostMapper().listPostsByIds(DeleteParam.builder().ids(postInfoPO.getPostId().toString()).build().getIds()); browserBean.setReplaceDatas(maps); postIdBrowser.setBrowserConditionParam(browserBean); diff --git a/src/com/engine/organization/service/impl/SequenceServiceImpl.java b/src/com/engine/organization/service/impl/SequenceServiceImpl.java index 58e22368..0748b948 100644 --- a/src/com/engine/organization/service/impl/SequenceServiceImpl.java +++ b/src/com/engine/organization/service/impl/SequenceServiceImpl.java @@ -6,7 +6,7 @@ import com.api.browser.bean.SearchConditionItem; import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.core.impl.Service; import com.engine.organization.component.OrganizationWeaTable; -import com.engine.organization.entity.QueryParam; +import com.engine.organization.entity.DeleteParam; import com.engine.organization.entity.TopTab; import com.engine.organization.entity.sequence.dto.SequenceDTO; import com.engine.organization.entity.sequence.param.SequenceSearchParam; @@ -123,7 +123,7 @@ public class SequenceServiceImpl extends Service implements SequenceService { browserItem.setValue(sequencePO.getSchemeId()); BrowserBean browserBean = browserItem.getBrowserConditionParam(); - List> maps = getSchemeMapper().listSchemesByIds(QueryParam.builder().ids(sequencePO.getSchemeId().toString()).build().getIds()); + List> maps = getSchemeMapper().listSchemesByIds(DeleteParam.builder().ids(sequencePO.getSchemeId().toString()).build().getIds()); browserBean.setReplaceDatas(maps); browserItem.setBrowserConditionParam(browserBean); diff --git a/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java b/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java index 92f081c2..8c654065 100644 --- a/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffPlanServiceImpl.java @@ -7,7 +7,7 @@ import com.api.browser.bean.SearchConditionOption; import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.core.impl.Service; import com.engine.organization.component.OrganizationWeaTable; -import com.engine.organization.entity.QueryParam; +import com.engine.organization.entity.DeleteParam; import com.engine.organization.entity.staff.bo.StaffPlanBO; import com.engine.organization.entity.staff.param.StaffPlanSearchParam; import com.engine.organization.entity.staff.po.StaffPlanPO; @@ -162,7 +162,7 @@ public class StaffPlanServiceImpl extends Service implements StaffPlanService { timeEndItem.setValue(staffPlanPO.getTimeEnd()); BrowserBean browserBean = companyIdtItem.getBrowserConditionParam(); - List> maps = getCompMapper().listCompsByIds(QueryParam.builder().ids(staffPlanPO.getCompanyId()).build().getIds()); + List> maps = getCompMapper().listCompsByIds(DeleteParam.builder().ids(staffPlanPO.getCompanyId()).build().getIds()); browserBean.setReplaceDatas(maps); companyIdtItem.setBrowserConditionParam(browserBean); diff --git a/src/com/engine/organization/service/impl/StaffServiceImpl.java b/src/com/engine/organization/service/impl/StaffServiceImpl.java index 5c092374..b6ebd23a 100644 --- a/src/com/engine/organization/service/impl/StaffServiceImpl.java +++ b/src/com/engine/organization/service/impl/StaffServiceImpl.java @@ -7,7 +7,7 @@ import com.api.browser.bean.SearchConditionOption; import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.core.impl.Service; import com.engine.organization.component.OrganizationWeaTable; -import com.engine.organization.entity.QueryParam; +import com.engine.organization.entity.DeleteParam; import com.engine.organization.entity.staff.bo.StaffBO; import com.engine.organization.entity.staff.param.StaffSearchParam; import com.engine.organization.entity.staff.po.StaffPO; @@ -178,22 +178,22 @@ public class StaffServiceImpl extends Service implements StaffService { OrganizationAssert.notNull(staffPO, "选择的数据不存在，或数据已删除"); BrowserBean planIdItemBean = planIdItem.getBrowserConditionParam(); - List> planIdMaps = getStaffPlanMapper().listPlansByIds(QueryParam.builder().ids(staffPO.getPlanId().toString()).build().getIds()); + List> planIdMaps = getStaffPlanMapper().listPlansByIds(DeleteParam.builder().ids(staffPO.getPlanId().toString()).build().getIds()); planIdItemBean.setReplaceDatas(planIdMaps); planIdItem.setBrowserConditionParam(planIdItemBean); BrowserBean compIdItemBean = compIdItem.getBrowserConditionParam(); - List> compIdMaps = getCompMapper().listCompsByIds(QueryParam.builder().ids(staffPO.getPlanId().toString()).build().getIds()); + List> compIdMaps = getCompMapper().listCompsByIds(DeleteParam.builder().ids(staffPO.getPlanId().toString()).build().getIds()); compIdItemBean.setReplaceDatas(compIdMaps); compIdItem.setBrowserConditionParam(compIdItemBean); BrowserBean deptIdItemBean = deptIdItem.getBrowserConditionParam(); - List> deptIdMaps = getDepartmentMapper().listDeptsByIds(QueryParam.builder().ids(staffPO.getPlanId().toString()).build().getIds()); + List> deptIdMaps = getDepartmentMapper().listDeptsByIds(DeleteParam.builder().ids(staffPO.getPlanId().toString()).build().getIds()); deptIdItemBean.setReplaceDatas(deptIdMaps); deptIdItem.setBrowserConditionParam(deptIdItemBean); BrowserBean jobIdItemBean = jobIdItem.getBrowserConditionParam(); - List> jobIdMaps = getJobMapper().listJobsByIds(QueryParam.builder().ids(staffPO.getPlanId().toString()).build().getIds()); + List> jobIdMaps = getJobMapper().listJobsByIds(DeleteParam.builder().ids(staffPO.getPlanId().toString()).build().getIds()); jobIdItemBean.setReplaceDatas(jobIdMaps); jobIdItem.setBrowserConditionParam(jobIdItemBean); diff --git a/src/com/engine/organization/transmethod/CompTransMethod.java b/src/com/engine/organization/transmethod/CompTransMethod.java index 63f637f2..a6e5bec3 100644 --- a/src/com/engine/organization/transmethod/CompTransMethod.java +++ b/src/com/engine/organization/transmethod/CompTransMethod.java @@ -1,6 +1,6 @@ package com.engine.organization.transmethod; -import com.engine.organization.entity.QueryParam; +import com.engine.organization.entity.DeleteParam; import com.engine.organization.mapper.comp.CompMapper; import com.engine.organization.util.db.MapperProxyFactory; @@ -18,7 +18,7 @@ public class CompTransMethod { public static String getSpanById(String planId) { CompMapper compMapper = MapperProxyFactory.getProxy(CompMapper.class); - List> maps = compMapper.listCompsByIds(QueryParam.builder().ids(planId).build().getIds()); + List> maps = compMapper.listCompsByIds(DeleteParam.builder().ids(planId).build().getIds()); String names = maps.stream().map(item -> (String) item.get("name")).collect(Collectors.joining(",")); return names; } diff --git a/src/com/engine/organization/transmethod/DepartmentTransMethod.java b/src/com/engine/organization/transmethod/DepartmentTransMethod.java index 72bc5867..8174029b 100644 --- a/src/com/engine/organization/transmethod/DepartmentTransMethod.java +++ b/src/com/engine/organization/transmethod/DepartmentTransMethod.java @@ -1,6 +1,6 @@ package com.engine.organization.transmethod; -import com.engine.organization.entity.QueryParam; +import com.engine.organization.entity.DeleteParam; import com.engine.organization.mapper.department.DepartmentMapper; import com.engine.organization.util.db.MapperProxyFactory; @@ -18,7 +18,7 @@ public class DepartmentTransMethod { public static String getSpanById(String planId) { DepartmentMapper departmentMapper = MapperProxyFactory.getProxy(DepartmentMapper.class); - List> maps = departmentMapper.listDeptsByIds(QueryParam.builder().ids(planId).build().getIds()); + List> maps = departmentMapper.listDeptsByIds(DeleteParam.builder().ids(planId).build().getIds()); String names = maps.stream().map(item -> (String) item.get("name")).collect(Collectors.joining(",")); return names; } diff --git a/src/com/engine/organization/transmethod/JobTransMethod.java b/src/com/engine/organization/transmethod/JobTransMethod.java index c7257131..3c50bc77 100644 --- a/src/com/engine/organization/transmethod/JobTransMethod.java +++ b/src/com/engine/organization/transmethod/JobTransMethod.java @@ -10,7 +10,7 @@ public class JobTransMethod { public static String getSpanById(String planId) { //JobMapper compMapper = MapperProxyFactory.getProxy(CompMapper.class); - //List> maps = compMapper.listCompsByIds(QueryParam.builder().ids(planId).build().getIds()); + //List> maps = compMapper.listCompsByIds(DeleteParam.builder().ids(planId).build().getIds()); //String names = maps.stream().map(item -> (String) item.get("name")).collect(Collectors.joining(",")); //return names; return ""; diff --git a/src/com/engine/organization/transmethod/LevelTransMethod.java b/src/com/engine/organization/transmethod/LevelTransMethod.java index 652ea2f2..aa5fb18d 100644 --- a/src/com/engine/organization/transmethod/LevelTransMethod.java +++ b/src/com/engine/organization/transmethod/LevelTransMethod.java @@ -1,6 +1,6 @@ package com.engine.organization.transmethod; -import com.engine.organization.entity.QueryParam; +import com.engine.organization.entity.DeleteParam; import com.engine.organization.mapper.scheme.LevelMapper; import com.engine.organization.util.db.MapperProxyFactory; @@ -18,7 +18,7 @@ public class LevelTransMethod { public static String getLevelId(String levelId) { LevelMapper levelMapper = MapperProxyFactory.getProxy(LevelMapper.class); - List> maps = levelMapper.listLevelsByIds(QueryParam.builder().ids(levelId).build().getIds()); + List> maps = levelMapper.listLevelsByIds(DeleteParam.builder().ids(levelId).build().getIds()); String levelName = maps.stream().map(item -> (String) item.get("name")).collect(Collectors.joining(",")); return levelName; } diff --git a/src/com/engine/organization/transmethod/StaffPlanTransMethod.java b/src/com/engine/organization/transmethod/StaffPlanTransMethod.java index 8ea7dd78..deaedfeb 100644 --- a/src/com/engine/organization/transmethod/StaffPlanTransMethod.java +++ b/src/com/engine/organization/transmethod/StaffPlanTransMethod.java @@ -1,6 +1,6 @@ package com.engine.organization.transmethod; -import com.engine.organization.entity.QueryParam; +import com.engine.organization.entity.DeleteParam; import com.engine.organization.mapper.staff.StaffPlanMapper; import com.engine.organization.util.db.MapperProxyFactory; @@ -18,7 +18,7 @@ public class StaffPlanTransMethod { public static String getSpanById(String planId) { StaffPlanMapper planMapper = MapperProxyFactory.getProxy(StaffPlanMapper.class); - List> maps = planMapper.listPlansByIds(QueryParam.builder().ids(planId).build().getIds()); + List> maps = planMapper.listPlansByIds(DeleteParam.builder().ids(planId).build().getIds()); String names = maps.stream().map(item -> (String) item.get("name")).collect(Collectors.joining(",")); return names; } diff --git a/src/com/engine/organization/web/CompController.java b/src/com/engine/organization/web/CompController.java index 2a3885ab..365fcc49 100644 --- a/src/com/engine/organization/web/CompController.java +++ b/src/com/engine/organization/web/CompController.java @@ -2,7 +2,7 @@ package com.engine.organization.web; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; -import com.engine.organization.entity.QueryParam; +import com.engine.organization.entity.DeleteParam; import com.engine.organization.entity.company.param.CompSearchParam; import com.engine.organization.util.response.ReturnResult; import com.engine.organization.wrapper.CompWrapper; @@ -124,7 +124,7 @@ public class CompController { @POST @Path("/deleteByIds") @Produces(MediaType.APPLICATION_JSON) - public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody QueryParam param) { + public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) { try { User user = HrmUserVarify.getUser(request, response); return ReturnResult.successed(getCompWrapper(user).deleteByIds(param.getIds())); diff --git a/src/com/engine/organization/web/DepartmentController.java b/src/com/engine/organization/web/DepartmentController.java index 3a6a6738..565e2e1f 100644 --- a/src/com/engine/organization/web/DepartmentController.java +++ b/src/com/engine/organization/web/DepartmentController.java @@ -2,7 +2,7 @@ package com.engine.organization.web; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; -import com.engine.organization.entity.QueryParam; +import com.engine.organization.entity.DeleteParam; import com.engine.organization.entity.department.param.DeptSearchParam; import com.engine.organization.entity.department.param.QuerySingleDeptListParam; import com.engine.organization.util.response.ReturnResult; @@ -138,7 +138,7 @@ public class DepartmentController { @POST @Path("/deleteByIds") @Produces(MediaType.APPLICATION_JSON) - public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody QueryParam param) { + public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) { try { User user = HrmUserVarify.getUser(request, response); return ReturnResult.successed(getDepartmentWrapper(user).deleteByIds(param.getIds())); diff --git a/src/com/engine/organization/web/GradeController.java b/src/com/engine/organization/web/GradeController.java index e4d429e7..78228099 100644 --- a/src/com/engine/organization/web/GradeController.java +++ b/src/com/engine/organization/web/GradeController.java @@ -2,7 +2,7 @@ package com.engine.organization.web; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; -import com.engine.organization.entity.QueryParam; +import com.engine.organization.entity.DeleteParam; import com.engine.organization.entity.scheme.param.GradeSearchParam; import com.engine.organization.util.response.ReturnResult; import com.engine.organization.wrapper.GradeWrapper; @@ -122,7 +122,7 @@ public class GradeController { @POST @Path("/deleteByIds") @Produces(MediaType.APPLICATION_JSON) - public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody QueryParam param) { + public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) { try { User user = HrmUserVarify.getUser(request, response); return ReturnResult.successed(getGradeWrapper(user).deleteByIds(param.getIds())); diff --git a/src/com/engine/organization/web/JobController.java b/src/com/engine/organization/web/JobController.java index 9f3aacf5..0bdc3de0 100644 --- a/src/com/engine/organization/web/JobController.java +++ b/src/com/engine/organization/web/JobController.java @@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; -import com.engine.organization.entity.QueryParam; +import com.engine.organization.entity.DeleteParam; import com.engine.organization.entity.job.param.JobSearchParam; import com.engine.organization.entity.searchtree.SearchTreeParams; import com.engine.organization.util.response.ReturnResult; @@ -15,10 +15,7 @@ import weaver.hrm.User; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import javax.ws.rs.*; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import java.util.Map; @@ -194,7 +191,7 @@ public class JobController { @POST @Path("/deleteByIds") @Produces(MediaType.APPLICATION_JSON) - public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody QueryParam param) { + public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) { try { User user = HrmUserVarify.getUser(request, response); return ReturnResult.successed(getJobWrapper(user).deleteByIds(param.getIds())); @@ -242,4 +239,31 @@ public class JobController { } + @GET + @Path("/getCopyForm") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult getCopyForm(@Context HttpServletRequest request, @Context HttpServletResponse response) { + try { + User user = HrmUserVarify.getUser(request, response); + return getJobWrapper(user).getCopyForm(); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } + + + @GET + @Path("/getHrmListByJobId") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult getHrmListByJobId(@Context HttpServletRequest request, @Context HttpServletResponse response, + @QueryParam("jobId") Long jobId) { + try { + User user = HrmUserVarify.getUser(request, response); + return getJobWrapper(user).getHrmListByJobId(jobId); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } + + } diff --git a/src/com/engine/organization/web/LevelController.java b/src/com/engine/organization/web/LevelController.java index 48b6aad3..772c13cc 100644 --- a/src/com/engine/organization/web/LevelController.java +++ b/src/com/engine/organization/web/LevelController.java @@ -2,7 +2,7 @@ package com.engine.organization.web; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; -import com.engine.organization.entity.QueryParam; +import com.engine.organization.entity.DeleteParam; import com.engine.organization.entity.scheme.param.LevelSearchParam; import com.engine.organization.util.response.ReturnResult; import com.engine.organization.wrapper.LevelWrapper; @@ -122,7 +122,7 @@ public class LevelController { @POST @Path("/deleteByIds") @Produces(MediaType.APPLICATION_JSON) - public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody QueryParam param) { + public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) { try { User user = HrmUserVarify.getUser(request, response); return ReturnResult.successed(getLevelWrapper(user).deleteByIds(param.getIds())); diff --git a/src/com/engine/organization/web/PostController.java b/src/com/engine/organization/web/PostController.java index 7bdf40c4..245f0baa 100644 --- a/src/com/engine/organization/web/PostController.java +++ b/src/com/engine/organization/web/PostController.java @@ -2,7 +2,7 @@ package com.engine.organization.web; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; -import com.engine.organization.entity.QueryParam; +import com.engine.organization.entity.DeleteParam; import com.engine.organization.entity.postion.po.PostPO; import com.engine.organization.util.response.ReturnResult; import com.engine.organization.wrapper.PostWrapper; @@ -84,7 +84,7 @@ public class PostController { @POST @Path("/deleteByIds") @Produces(MediaType.APPLICATION_JSON) - public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody QueryParam param) { + public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) { try { User user = HrmUserVarify.getUser(request, response); return ReturnResult.successed(getPostWrapper(user).deleteByIds(param.getIds())); diff --git a/src/com/engine/organization/web/PostInfoController.java b/src/com/engine/organization/web/PostInfoController.java index 93e4a1b9..a2c5ae1e 100644 --- a/src/com/engine/organization/web/PostInfoController.java +++ b/src/com/engine/organization/web/PostInfoController.java @@ -2,7 +2,7 @@ package com.engine.organization.web; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; -import com.engine.organization.entity.QueryParam; +import com.engine.organization.entity.DeleteParam; import com.engine.organization.entity.postion.param.PostInfoSearchParam; import com.engine.organization.util.response.ReturnResult; import com.engine.organization.wrapper.PostInfoWrapper; @@ -122,7 +122,7 @@ public class PostInfoController { @POST @Path("/deleteByIds") @Produces(MediaType.APPLICATION_JSON) - public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody QueryParam param) { + public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) { try { User user = HrmUserVarify.getUser(request, response); return ReturnResult.successed(getPostInfoWrapper(user).deleteByIds(param.getIds())); diff --git a/src/com/engine/organization/web/SchemeController.java b/src/com/engine/organization/web/SchemeController.java index e461a51a..1852d1b7 100644 --- a/src/com/engine/organization/web/SchemeController.java +++ b/src/com/engine/organization/web/SchemeController.java @@ -2,7 +2,7 @@ package com.engine.organization.web; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; -import com.engine.organization.entity.QueryParam; +import com.engine.organization.entity.DeleteParam; import com.engine.organization.entity.scheme.param.SchemeSearchParam; import com.engine.organization.util.response.ReturnResult; import com.engine.organization.wrapper.SchemeWrapper; @@ -128,7 +128,7 @@ public class SchemeController { @POST @Path("/deleteByIds") @Produces(MediaType.APPLICATION_JSON) - public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody QueryParam param) { + public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) { try { User user = HrmUserVarify.getUser(request, response); getSchemeWrapper(user).deleteByIds(param.getIds()); diff --git a/src/com/engine/organization/web/SequenceController.java b/src/com/engine/organization/web/SequenceController.java index faf2b8b0..557bba6b 100644 --- a/src/com/engine/organization/web/SequenceController.java +++ b/src/com/engine/organization/web/SequenceController.java @@ -2,7 +2,7 @@ package com.engine.organization.web; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; -import com.engine.organization.entity.QueryParam; +import com.engine.organization.entity.DeleteParam; import com.engine.organization.entity.sequence.param.SequenceSearchParam; import com.engine.organization.util.response.ReturnResult; import com.engine.organization.wrapper.SequenceWrapper; @@ -122,7 +122,7 @@ public class SequenceController { @POST @Path("/deleteByIds") @Produces(MediaType.APPLICATION_JSON) - public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody QueryParam param) { + public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) { try { User user = HrmUserVarify.getUser(request, response); return ReturnResult.successed(getSequenceWrapper(user).deleteByIds(param.getIds())); diff --git a/src/com/engine/organization/web/StaffController.java b/src/com/engine/organization/web/StaffController.java index 821bc299..9f93a9d9 100644 --- a/src/com/engine/organization/web/StaffController.java +++ b/src/com/engine/organization/web/StaffController.java @@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; -import com.engine.organization.entity.QueryParam; +import com.engine.organization.entity.DeleteParam; import com.engine.organization.entity.staff.param.StaffSearchParam; import com.engine.organization.util.response.ReturnResult; import com.engine.organization.wrapper.StaffWrapper; @@ -105,7 +105,7 @@ public class StaffController { @POST @Path("/deleteByIds") @Produces(MediaType.APPLICATION_JSON) - public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody QueryParam param) { + public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) { try { User user = HrmUserVarify.getUser(request, response); return ReturnResult.successed(getStaffWrapper(user).deleteByIds(param.getIds())); diff --git a/src/com/engine/organization/web/StaffPlanController.java b/src/com/engine/organization/web/StaffPlanController.java index 7576b433..b3e593cc 100644 --- a/src/com/engine/organization/web/StaffPlanController.java +++ b/src/com/engine/organization/web/StaffPlanController.java @@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.engine.common.util.ParamUtil; import com.engine.common.util.ServiceUtil; -import com.engine.organization.entity.QueryParam; +import com.engine.organization.entity.DeleteParam; import com.engine.organization.entity.staff.param.StaffPlanSearchParam; import com.engine.organization.util.response.ReturnResult; import com.engine.organization.wrapper.StaffPlanWrapper; @@ -125,7 +125,7 @@ public class StaffPlanController { @POST @Path("/deleteByIds") @Produces(MediaType.APPLICATION_JSON) - public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody QueryParam param) { + public ReturnResult deleteByIds(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody DeleteParam param) { try { User user = HrmUserVarify.getUser(request, response); return ReturnResult.successed(getStaffPlanWrapper(user).deleteByIds(param.getIds())); diff --git a/src/com/engine/organization/wrapper/JobWrapper.java b/src/com/engine/organization/wrapper/JobWrapper.java index 5a9d9801..63480210 100644 --- a/src/com/engine/organization/wrapper/JobWrapper.java +++ b/src/com/engine/organization/wrapper/JobWrapper.java @@ -1,14 +1,19 @@ package com.engine.organization.wrapper; +import com.api.browser.bean.SearchConditionItem; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.organization.entity.job.param.JobSearchParam; import com.engine.organization.entity.searchtree.SearchTreeParams; import com.engine.organization.service.JobService; import com.engine.organization.service.impl.JobServiceImpl; +import com.engine.organization.util.OrganizationFormItemUtil; +import com.engine.organization.util.response.ReturnResult; import weaver.hrm.User; +import java.util.ArrayList; import java.util.Collection; +import java.util.List; import java.util.Map; /** @@ -130,4 +135,25 @@ public class JobWrapper extends Service { } + /** + * 获取复制表单 + * @return + */ + public ReturnResult getCopyForm() { + List condition = new ArrayList<>(); + SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "复制到", "161", "department", "deptBrowser"); + deptBrowserItem.setRules("required|string"); + condition.add(deptBrowserItem); + return ReturnResult.successed(condition); + } + + /** + * 根据岗位获取人员 + * @param jobId + * @return + */ + public ReturnResult getHrmListByJobId(Long jobId) { + Map hrmListByJobId = getJobService(user).getHrmListByJobId(jobId); + return ReturnResult.successed(hrmListByJobId); + } }