From c280c5f9082ebd30e8a012d55d14436d481c28b0 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Wed, 7 Sep 2022 19:12:42 +0800 Subject: [PATCH] fixed --- .../entity/employee/vo/EmployeeTableVO.java | 2 +- .../organization/service/SequenceService.java | 6 ++++++ .../service/impl/CompServiceImpl.java | 3 ++- .../service/impl/GradeServiceImpl.java | 2 +- .../service/impl/JobServiceImpl.java | 11 +++++++++++ .../service/impl/SequenceServiceImpl.java | 8 ++++++++ .../organization/web/SequenceController.java | 16 ++++++++++++++++ .../engine/organization/wrapper/JobWrapper.java | 2 +- .../organization/wrapper/SequenceWrapper.java | 5 +++++ 9 files changed, 51 insertions(+), 4 deletions(-) diff --git a/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java b/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java index 7e3c7e6c..a9220e4c 100644 --- a/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java +++ b/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java @@ -23,7 +23,7 @@ import lombok.NoArgsConstructor; fields = "t.id," + "t.lastname," + "t.mobile," + - "t.," + + "t.companystartdate," + "t.sex", fromSql = "FROM HrmResource t ", orderby = "id desc", diff --git a/src/com/engine/organization/service/SequenceService.java b/src/com/engine/organization/service/SequenceService.java index 90d03775..3cbfb7a3 100644 --- a/src/com/engine/organization/service/SequenceService.java +++ b/src/com/engine/organization/service/SequenceService.java @@ -78,4 +78,10 @@ public interface SequenceService { */ Map getTabInfo(); + /** + * 获取岗位序列下方案信息 + * @param params + * @return + */ + Map getSchemeInfo(Map params); } diff --git a/src/com/engine/organization/service/impl/CompServiceImpl.java b/src/com/engine/organization/service/impl/CompServiceImpl.java index 035de964..e633b28b 100644 --- a/src/com/engine/organization/service/impl/CompServiceImpl.java +++ b/src/com/engine/organization/service/impl/CompServiceImpl.java @@ -347,6 +347,7 @@ public class CompServiceImpl extends Service implements CompService { List addGroups = new ArrayList<>(); List condition = new ArrayList<>(); SearchConditionItem compBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "转移到", "164", "company", "compBrowser"); + compBrowserItem.setHelpfulTip("在不选择分部情况下,默认转移到集团下一级分部！！！"); condition.add(compBrowserItem); addGroups.add(new SearchConditionGroup("", true, condition)); return addGroups; @@ -355,7 +356,7 @@ public class CompServiceImpl extends Service implements CompService { @Override public int moveCompany(DepartmentMoveParam moveParam) { Long targetCompanyId = moveParam.getCompany(); - OrganizationAssert.notNull(targetCompanyId, "请选择要转移到的分部"); + //OrganizationAssert.notNull(targetCompanyId, "请选择要转移到的分部"); Long companyId = moveParam.getId(); // 判断目标分部是否为它本身以及子元素 Set disableIds = new HashSet<>(); diff --git a/src/com/engine/organization/service/impl/GradeServiceImpl.java b/src/com/engine/organization/service/impl/GradeServiceImpl.java index ab65d10c..dde702cb 100644 --- a/src/com/engine/organization/service/impl/GradeServiceImpl.java +++ b/src/com/engine/organization/service/impl/GradeServiceImpl.java @@ -220,7 +220,7 @@ public class GradeServiceImpl extends Service implements GradeService { @Override public String getLevelId(Long id) { - return MapperProxyFactory.getProxy(GradeMapper.class).getGradeByID(id).getLevelId(); + return id != null ? MapperProxyFactory.getProxy(GradeMapper.class).getGradeByID(id).getLevelId() : ""; } /** diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index b047b16b..a354a65e 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -52,6 +52,7 @@ import com.engine.organization.util.relation.EcHrmRelationUtil; import com.engine.organization.util.tree.SearchTreeUtil; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; +import weaver.conn.RecordSet; import weaver.general.StringUtil; import weaver.general.Util; import weaver.hrm.User; @@ -431,6 +432,16 @@ public class JobServiceImpl extends Service implements JobService { @Override public Map getHrmListByJobId(Long jobId) { OrganizationWeaTable table = new OrganizationWeaTable<>(user, EmployeeTableVO.class); + RecordSet rs = new RecordSet(); + List ids = new ArrayList<>(); + rs.executeQuery("select id from cus_fielddata where field100002 = ?",jobId); + while (rs.next()) { + ids.add(Util.null2String(rs.getString("id"))); + } + if (CollectionUtils.isEmpty(ids)){ + ids.add("-1"); + } + table.setSqlwhere(" where id in ("+StringUtils.join(ids,",")+") and status<4"); WeaResultMsg result = new WeaResultMsg(false); result.putAll(table.makeDataResult()); result.success(); diff --git a/src/com/engine/organization/service/impl/SequenceServiceImpl.java b/src/com/engine/organization/service/impl/SequenceServiceImpl.java index fefd3d20..9038c523 100644 --- a/src/com/engine/organization/service/impl/SequenceServiceImpl.java +++ b/src/com/engine/organization/service/impl/SequenceServiceImpl.java @@ -182,6 +182,14 @@ public class SequenceServiceImpl extends Service implements SequenceService { return apiDatas; } + @Override + public Map getSchemeInfo(Map params) { + String sequenceId = Util.null2String(params.get("sequenceId")); + SequencePO sequencePO = getSequenceMapper().getSequenceByID(Long.parseLong(sequenceId)); + List> maps = getSchemeMapper().listSchemesByIds(DeleteParam.builder().ids(sequencePO.getSchemeId().toString()).build().getIds()); + return maps.get(0); + } + /** * 查询条件 * diff --git a/src/com/engine/organization/web/SequenceController.java b/src/com/engine/organization/web/SequenceController.java index b432611f..0552c5ab 100644 --- a/src/com/engine/organization/web/SequenceController.java +++ b/src/com/engine/organization/web/SequenceController.java @@ -202,4 +202,20 @@ public class SequenceController { return ReturnResult.exceptionHandle(e); } } + + @GET + @Path("/getSchemeInfo") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult getSchemeInfo(@Context HttpServletRequest request, @Context HttpServletResponse response) { + try { + User user = HrmUserVarify.getUser(request, response); + Map map = ParamUtil.request2Map(request); + return ReturnResult.successed(getSequenceWrapper(user).getSchemeInfo(map)); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e); + } + } + + + } diff --git a/src/com/engine/organization/wrapper/JobWrapper.java b/src/com/engine/organization/wrapper/JobWrapper.java index e25794fb..0c9f4249 100644 --- a/src/com/engine/organization/wrapper/JobWrapper.java +++ b/src/com/engine/organization/wrapper/JobWrapper.java @@ -199,7 +199,7 @@ public class JobWrapper extends OrganizationWrapper { public ReturnResult getCopyForm() { List addGroups = new ArrayList<>(); List condition = new ArrayList<>(); - SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "复制到", "161", "department", "deptBrowser"); + SearchConditionItem deptBrowserItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 3, false, "复制到", "4", "department", "deptBrowser"); deptBrowserItem.setRules("required|string"); condition.add(deptBrowserItem); addGroups.add(new SearchConditionGroup("", true, condition)); diff --git a/src/com/engine/organization/wrapper/SequenceWrapper.java b/src/com/engine/organization/wrapper/SequenceWrapper.java index fdfe22ff..6baf9d1f 100644 --- a/src/com/engine/organization/wrapper/SequenceWrapper.java +++ b/src/com/engine/organization/wrapper/SequenceWrapper.java @@ -140,4 +140,9 @@ public class SequenceWrapper extends OrganizationWrapper { public Map getTabInfo() { return getSequenceService(user).getTabInfo(); } + + + public Map getSchemeInfo(Map map) { + return getSequenceService(user).getSchemeInfo(map); + } }