From 2e58769c8b7b18f0ab60f5eba5a504523b374c5e Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Wed, 5 Jul 2023 09:16:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/chart/ReasourceListParam.java | 21 ++++++++++ .../entity/chart/ResourceListColumns.java | 27 +++++++++++++ .../hrmresource/po/ResourceChartPO.java | 39 +++++++++++++++++++ .../hrmresource/vo/ResourceChartVO.java | 38 ++++++++++++++++++ .../mapper/resource/HrmResourceMapper.java | 11 ++++++ .../mapper/resource/HrmResourceMapper.xml | 5 +++ .../mapper/resource/ResourceMapper.java | 3 ++ .../service/HrmResourceService.java | 12 ++++++ .../service/impl/HrmResourceServiceImpl.java | 6 +++ .../organization/web/OrgChartController.java | 2 + 10 files changed, 164 insertions(+) create mode 100644 src/com/engine/organization/entity/chart/ReasourceListParam.java create mode 100644 src/com/engine/organization/entity/chart/ResourceListColumns.java create mode 100644 src/com/engine/organization/entity/hrmresource/po/ResourceChartPO.java create mode 100644 src/com/engine/organization/entity/hrmresource/vo/ResourceChartVO.java diff --git a/src/com/engine/organization/entity/chart/ReasourceListParam.java b/src/com/engine/organization/entity/chart/ReasourceListParam.java new file mode 100644 index 00000000..a98e5d5e --- /dev/null +++ b/src/com/engine/organization/entity/chart/ReasourceListParam.java @@ -0,0 +1,21 @@ +package com.engine.organization.entity.chart; + +import com.engine.organization.common.BaseQueryParam; +import lombok.*; + +/** + * @Author liang.cheng + * @Date 2023/7/3 2:48 PM + * @Description: TODO + * @Version 1.0 + */ + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@EqualsAndHashCode(callSuper=false) +public class ReasourceListParam extends BaseQueryParam { + + private Integer departmentId; +} diff --git a/src/com/engine/organization/entity/chart/ResourceListColumns.java b/src/com/engine/organization/entity/chart/ResourceListColumns.java new file mode 100644 index 00000000..4ed631c4 --- /dev/null +++ b/src/com/engine/organization/entity/chart/ResourceListColumns.java @@ -0,0 +1,27 @@ +package com.engine.organization.entity.chart; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author liang.cheng + * @Date 2023/7/3 2:16 PM + * @Description: TODO + * @Version 1.0 + */ + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class ResourceListColumns { + + private String title; + + private String dataIndex; + + private String key; + +} diff --git a/src/com/engine/organization/entity/hrmresource/po/ResourceChartPO.java b/src/com/engine/organization/entity/hrmresource/po/ResourceChartPO.java new file mode 100644 index 00000000..63868f50 --- /dev/null +++ b/src/com/engine/organization/entity/hrmresource/po/ResourceChartPO.java @@ -0,0 +1,39 @@ +package com.engine.organization.entity.hrmresource.po; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author liang.cheng + * @Date 2023/7/3 2:25 PM + * @Description: TODO + * @Version 1.0 + */ + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class ResourceChartPO { + + private Long id; + + private String workCode; + + private String lastName; + + private String sex; + + private Integer departmentId; + + private Integer subcompanyid1; + + private Integer jobTitle; + + private Integer status; + + private String mobile; + +} diff --git a/src/com/engine/organization/entity/hrmresource/vo/ResourceChartVO.java b/src/com/engine/organization/entity/hrmresource/vo/ResourceChartVO.java new file mode 100644 index 00000000..5ac49413 --- /dev/null +++ b/src/com/engine/organization/entity/hrmresource/vo/ResourceChartVO.java @@ -0,0 +1,38 @@ +package com.engine.organization.entity.hrmresource.vo; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author liang.cheng + * @Date 2023/7/3 2:40 PM + * @Description: TODO + * @Version 1.0 + */ + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class ResourceChartVO { + + private Long id; + + private String workCode; + + private String lastName; + + private String sex; + + private String departmentName; + + private String subcompanyName; + + private String jobTitle; + + private Integer status; + + private String mobile; +} diff --git a/src/com/engine/organization/mapper/resource/HrmResourceMapper.java b/src/com/engine/organization/mapper/resource/HrmResourceMapper.java index 1556a3d8..e926d5a1 100644 --- a/src/com/engine/organization/mapper/resource/HrmResourceMapper.java +++ b/src/com/engine/organization/mapper/resource/HrmResourceMapper.java @@ -1,6 +1,7 @@ package com.engine.organization.mapper.resource; import com.alibaba.fastjson.JSONObject; +import com.engine.organization.entity.hrmresource.po.ResourceChartPO; import com.engine.organization.entity.hrmresource.po.ResourcePO; import com.engine.organization.entity.hrmresource.param.SearchTemplateParam; import com.engine.organization.entity.hrmresource.po.SearchTemplatePO; @@ -78,4 +79,14 @@ public interface HrmResourceMapper { String queryLabelName(@Param("fieldName") String fieldName, @Param("scopeId") String scopeId); + /** + * @Description: 根据部门查询 + * @Author: liang.cheng + * @Date: 2023/7/3 2:38 PM + * @param: [departmentId] + * @return: java.util.List + */ + List selectByDepartmentId(@Param("departmentId")Integer departmentId); + + } diff --git a/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml b/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml index 6269d647..e7d48fa6 100644 --- a/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml +++ b/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml @@ -443,4 +443,9 @@ and creator = #{userId} + + \ No newline at end of file diff --git a/src/com/engine/organization/mapper/resource/ResourceMapper.java b/src/com/engine/organization/mapper/resource/ResourceMapper.java index 3883e6fd..3d348299 100644 --- a/src/com/engine/organization/mapper/resource/ResourceMapper.java +++ b/src/com/engine/organization/mapper/resource/ResourceMapper.java @@ -2,6 +2,7 @@ package com.engine.organization.mapper.resource; import com.engine.organization.entity.hrmresource.po.HrmResourcePO; +import com.engine.organization.entity.hrmresource.po.ResourceChartPO; import com.engine.organization.entity.hrmresource.vo.HrmResourceVO; import org.apache.ibatis.annotations.Param; @@ -39,4 +40,6 @@ public interface ResourceMapper { List getIdByKeyField(@Param("keyField") String keyField, @Param("keyFieldValue") String keyFieldValue); + + } diff --git a/src/com/engine/organization/service/HrmResourceService.java b/src/com/engine/organization/service/HrmResourceService.java index f5487042..d635110c 100644 --- a/src/com/engine/organization/service/HrmResourceService.java +++ b/src/com/engine/organization/service/HrmResourceService.java @@ -167,4 +167,16 @@ public interface HrmResourceService { Map getCustomTransferData(Map params); Integer saveColumnsCustomTemplate(Map params); + + + /** + * @Description: 组织图人员列表 + * @Author: liang.cheng + * @Date: 2023/7/3 11:04 AM + * @param: [departmentId] + * @return: java.util.Map + */ + Map chartResourceList(Integer departmentId); + + } diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index 273c9fd6..478e5841 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -423,6 +423,12 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic return jclOrgCustomTemplatePO.getId(); } + @Override + public Map chartResourceList(Integer departmentId) { + + return null; + } + @Override public Map getSearchCondition(Map params) { String templateId = Util.null2String(params.get("templateId")); diff --git a/src/com/engine/organization/web/OrgChartController.java b/src/com/engine/organization/web/OrgChartController.java index b4ddc9e8..7bace160 100644 --- a/src/com/engine/organization/web/OrgChartController.java +++ b/src/com/engine/organization/web/OrgChartController.java @@ -65,6 +65,8 @@ public class OrgChartController { + + @GET @Path("/getSubCompanyTree") @Produces(MediaType.APPLICATION_JSON)