组织架构图
This commit is contained in:
parent
0592b4dae1
commit
2e58769c8b
|
|
@ -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;
|
||||
}
|
||||
|
|
@ -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;
|
||||
|
||||
}
|
||||
|
|
@ -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;
|
||||
|
||||
}
|
||||
|
|
@ -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;
|
||||
}
|
||||
|
|
@ -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);
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 < 4
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
|
|
@ -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);
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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"));
|
||||
|
|
|
|||
|
|
@ -65,6 +65,8 @@ public class OrgChartController {
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
@GET
|
||||
@Path("/getSubCompanyTree")
|
||||
@Produces(MediaType.APPLICATION_JSON)
|
||||
|
|
|
|||
Loading…
Reference in New Issue