Merge pull request '组织架构图' (#174) from feature/cl into develop

Reviewed-on: #174

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;
+}

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;
+
+}

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;
+
+}

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;
+}

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<com.engine.organization.entity.hrmresource.po.ResourceChartPO>
+     */
+    List<ResourceChartPO> selectByDepartmentId(@Param("departmentId")Integer departmentId);
+
+
 }

src/com/engine/organization/mapper/resource/HrmResourceMapper.xml

@@ -443,4 +443,9 @@
           and creator = #{userId}
     </select>
 
+    <select id="selectByDepartmentId" resultType="com.engine.organization.entity.hrmresource.po.ResourceChartPO">
+        select id,workcode,lastname,sex,departmentid,subcompanyid1,jobtitle,status,mobile
+        from hrmresource where departmentid = #{departmentId} and status &lt; 4
+    </select>
+
 </mapper>

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<Long> getIdByKeyField(@Param("keyField") String keyField, @Param("keyFieldValue") String keyFieldValue);
 
 
+
+
 }

src/com/engine/organization/service/HrmResourceService.java

@@ -167,4 +167,16 @@ public interface HrmResourceService {
     Map<String, Object> getCustomTransferData(Map<String, Object> params);
 
     Integer saveColumnsCustomTemplate(Map<String, Object> params);
+
+
+    /**
+     * @Description: 组织图人员列表
+     * @Author: liang.cheng
+     * @Date: 2023/7/3 11:04 AM
+     * @param: [departmentId]
+     * @return: java.util.Map<java.lang.String,java.lang.Object>
+     */
+    Map<String, Object> chartResourceList(Integer departmentId);
+
+
 }

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<String, Object> chartResourceList(Integer departmentId) {
+
+        return null;
+    }
+
     @Override
     public Map<String, Object> getSearchCondition(Map<String, Object> params) {
         String templateId = Util.null2String(params.get("templateId"));

src/com/engine/organization/web/OrgChartController.java

@@ -65,6 +65,8 @@ public class OrgChartController {
 
 
 
+
+
     @GET
     @Path("/getSubCompanyTree")
     @Produces(MediaType.APPLICATION_JSON)