From be1b6d3610548178f72eb5840e52370117a29ec2 Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 20 Oct 2020 11:06:25 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E8=80=83=E6=A0=B8=E7=BB=84=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/app/dto/DepartmentsSimpleDto.java | 37 +++++++ .../flow/dao/StaffRoleDepartmentMapper.java | 3 + .../flow/model/EvaluationGroupDto.java | 100 +++--------------- .../service/StaffRoleDepartmentService.java | 3 + .../impl/StaffRoleDepartmentServiceImpl.java | 6 ++ .../controller/EvaluationGroupController.java | 78 +++++++++++++- .../mapper/flow/StaffRoleDepartmentMapper.xml | 9 ++ 7 files changed, 149 insertions(+), 87 deletions(-) create mode 100644 src/main/java/com/lz/modules/app/dto/DepartmentsSimpleDto.java diff --git a/src/main/java/com/lz/modules/app/dto/DepartmentsSimpleDto.java b/src/main/java/com/lz/modules/app/dto/DepartmentsSimpleDto.java new file mode 100644 index 00000000..583438e5 --- /dev/null +++ b/src/main/java/com/lz/modules/app/dto/DepartmentsSimpleDto.java @@ -0,0 +1,37 @@ +package com.lz.modules.app.dto; + +import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * 部门表 + * + * @author fumeiai + * @email fumeiai@linzikg.com + * @date 2020-04-30 16:59:50 + */ +@Data +@ApiModel("部门简单信息Dto") +public class DepartmentsSimpleDto implements Serializable{ + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "部门id", name = "id") + private Integer id; + /** + * 飞书显示部门人数 + */ + @ApiModelProperty(value = "部门人数", name = "memberCount") + private Integer memberCount; + /** + * 组织架构名称/部门名称 + */ + @ApiModelProperty(value = "部门名称", name = "departmentName") + private String departmentName; + + +} diff --git a/src/main/java/com/lz/modules/flow/dao/StaffRoleDepartmentMapper.java b/src/main/java/com/lz/modules/flow/dao/StaffRoleDepartmentMapper.java index 50399f31..30158b1c 100644 --- a/src/main/java/com/lz/modules/flow/dao/StaffRoleDepartmentMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/StaffRoleDepartmentMapper.java @@ -8,6 +8,7 @@ package com.lz.modules.flow.dao; * @since 2020-08-18 */ import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.lz.modules.app.dto.DepartmentsSimpleDto; import com.lz.modules.flow.entity.StaffRoleDepartment; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -42,4 +43,6 @@ public interface StaffRoleDepartmentMapper extends BaseMapper selectStaffRoleDepartmentByStaffRoleIdDepartments(@Param("staffRoleId") Long staffRoleId, @Param("departments") List departments); + + List selectDepartmentSimpleInfos(@Param("ids") List ids); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/model/EvaluationGroupDto.java b/src/main/java/com/lz/modules/flow/model/EvaluationGroupDto.java index feb35272..2fb7fbf7 100644 --- a/src/main/java/com/lz/modules/flow/model/EvaluationGroupDto.java +++ b/src/main/java/com/lz/modules/flow/model/EvaluationGroupDto.java @@ -1,7 +1,12 @@ package com.lz.modules.flow.model; +import com.lz.modules.app.dto.DepartmentsSimpleDto; +import com.lz.modules.app.dto.StaffSimpleDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; + +import java.util.List; + /** *

*

*考评组表 @@ -19,20 +24,18 @@ public class EvaluationGroupDto { @ApiModelProperty(value = "", name = "name") private String name; //绩效管理员ID，system_user,id，逗号隔开 - @ApiModelProperty(value = "绩效管理员ID，system_user,id，逗号隔开", name = "managerIds") - private Long managerIds; + @ApiModelProperty(value = "绩效管理员集合，如果人员离职不会返回", name = "managerIds") + private List managers; //参与部门id，逗号隔开 - @ApiModelProperty(value = "参与部门id，逗号隔开", name = "depIds") - private Long depIds; + @ApiModelProperty(value = "参与部门集合，如果部门不存在不会返回", name = "deps") + private List deps; //参与考核员工staff_id，逗号隔开 - @ApiModelProperty(value = "参与考核员工staff_id，逗号隔开", name = "staffIds") - private Long staffIds; + @ApiModelProperty(value = "参与考核员集合，如果人员离职不会返回", name = "staffs") + private List staffs; //0部门，1人员 - @ApiModelProperty(value = "0部门，1人员", name = "inType") - private Integer inType; //排除人员ids，逗号隔开 - @ApiModelProperty(value = "排除人员ids，逗号隔开", name = "outIds") - private Long outIds; + @ApiModelProperty(value = "排除人员集合，如果人员离职不会返回", name = "outs") + private List outs; /** * * @return @@ -63,91 +66,18 @@ public class EvaluationGroupDto { this.name = name; } - /** - * 绩效管理员ID，system_user,id，逗号隔开 - * @return - */ - public Long getManagerIds() { - return managerIds; - } - /** - * 绩效管理员ID，system_user,id，逗号隔开 - * @param managerIds - */ - public void setManagerIds(Long managerIds) { - this.managerIds = managerIds; - } - /** - * 参与部门id，逗号隔开 - * @return - */ - public Long getDepIds() { - return depIds; - } - /** - * 参与部门id，逗号隔开 - * @param depIds - */ - public void setDepIds(Long depIds) { - this.depIds = depIds; - } - /** - * 参与考核员工staff_id，逗号隔开 - * @return - */ - public Long getStaffIds() { - return staffIds; - } - /** - * 参与考核员工staff_id，逗号隔开 - * @param staffIds - */ - public void setStaffIds(Long staffIds) { - this.staffIds = staffIds; - } - /** - * 0部门，1人员 - * @return - */ - public Integer getInType() { - return inType; - } - /** - * 0部门，1人员 - * @param inType - */ - public void setInType(Integer inType) { - this.inType = inType; - } - /** - * 排除人员ids，逗号隔开 - * @return - */ - public Long getOutIds() { - return outIds; - } - /** - * 排除人员ids，逗号隔开 - * @param outIds - */ - public void setOutIds(Long outIds) { - this.outIds = outIds; - } + + @Override public String toString() { return "EvaluationGroup{" + ",id=" + id + ",name=" + name + - ",managerIds=" + managerIds + - ",depIds=" + depIds + - ",staffIds=" + staffIds + - ",inType=" + inType + - ",outIds=" + outIds + "}"; } } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/StaffRoleDepartmentService.java b/src/main/java/com/lz/modules/flow/service/StaffRoleDepartmentService.java index 48db35e0..408e17ad 100644 --- a/src/main/java/com/lz/modules/flow/service/StaffRoleDepartmentService.java +++ b/src/main/java/com/lz/modules/flow/service/StaffRoleDepartmentService.java @@ -1,6 +1,7 @@ package com.lz.modules.flow.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.lz.modules.app.dto.DepartmentsSimpleDto; import com.lz.modules.flow.entity.StaffRoleDepartment; import java.util.List; @@ -39,4 +40,6 @@ public interface StaffRoleDepartmentService extends IService ids); void deleteStaffRoleDepartment(Long id); + + List selectDepartmentSimpleInfos(List ids); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleDepartmentServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleDepartmentServiceImpl.java index 4f10c558..73ed66bd 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleDepartmentServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleDepartmentServiceImpl.java @@ -1,6 +1,7 @@ package com.lz.modules.flow.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.lz.modules.app.dto.DepartmentsSimpleDto; import com.lz.modules.flow.dao.StaffRoleDepartmentMapper; import com.lz.modules.flow.entity.StaffRoleDepartment; import com.lz.modules.flow.service.StaffRoleDepartmentService; @@ -80,5 +81,10 @@ public class StaffRoleDepartmentServiceImpl extends ServiceImpl selectDepartmentSimpleInfos(List ids){ + return staffRoleDepartmentMapper.selectDepartmentSimpleInfos(ids); + } + } diff --git a/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java b/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java index 465bda64..0f3f24e8 100644 --- a/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java +++ b/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java @@ -5,20 +5,29 @@ import com.alibaba.fastjson.JSONObject; import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; import com.lz.common.utils.StringUtil; +import com.lz.modules.app.dto.DepartmentsSimpleDto; +import com.lz.modules.app.dto.StaffSimpleDto; +import com.lz.modules.app.service.StaffService; import com.lz.modules.flow.entity.EvaluationGroup; import com.lz.modules.flow.entity.FlowManager; import com.lz.modules.flow.entity.ResultModel; +import com.lz.modules.flow.model.EvaluationGroupDto; import com.lz.modules.flow.req.EvaluationGroupReq; import com.lz.modules.flow.service.EvaluationGroupService; import com.lz.modules.flow.service.FlowManagerService; import com.lz.modules.flow.service.ResultModelService; +import com.lz.modules.flow.service.StaffRoleDepartmentService; import io.swagger.annotations.*; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; @RestController @RequestMapping("/evaluationGroup") @@ -34,14 +43,79 @@ public class EvaluationGroupController { @Autowired private ResultModelService resultModelService; + @Autowired + private StaffService staffService; + + @Autowired + private StaffRoleDepartmentService staffRoleDepartmentService; - @PostMapping("/getById") + @GetMapping("/getById") + @ApiOperation("获取考核组详情") + @ApiResponses({@ApiResponse(code=200,message = "成功", response= EvaluationGroupDto.class)}) + public R getById(@RequestParam @ApiParam("考核组id") Long id) { + EvaluationGroup evaluationGroup = evaluationGroupService.selectEvaluationGroupById(id); + EvaluationGroupDto evaluationGroupDto = new EvaluationGroupDto(); + if(evaluationGroup.getDepIds() != null && evaluationGroup.getDepIds().length() > 0){ + + List ids = Arrays.stream(evaluationGroup.getDepIds().split(",")).map(new Function() { + @Override + public Long apply(String s) { + return Long.parseLong(s); + } + }).collect(Collectors.toList()); + List departmentsSimpleDtos = staffRoleDepartmentService.selectDepartmentSimpleInfos(ids); + evaluationGroupDto.setDeps(departmentsSimpleDtos); + } + if(evaluationGroup.getStaffIds() != null && evaluationGroup.getStaffIds().length() > 0){ + List ids = Arrays.stream(evaluationGroup.getStaffIds().split(",")).map(new Function() { + @Override + public Long apply(String s) { + return Long.parseLong(s); + } + }).collect(Collectors.toList()); + + //指定人员，搜索人员信息 + List staffSimpleDtos = staffService.selectStaffSimpleInfoByIds(ids); + evaluationGroupDto.setStaffs(staffSimpleDtos); + } + + if(evaluationGroup.getManagerIds() != null && evaluationGroup.getManagerIds().length() > 0){ + List ids = Arrays.stream(evaluationGroup.getManagerIds().split(",")).map(new Function() { + @Override + public Long apply(String s) { + return Long.parseLong(s); + } + }).collect(Collectors.toList()); + + //指定人员，搜索人员信息 + List staffSimpleDtos = staffService.selectStaffSimpleInfoByIds(ids); + evaluationGroupDto.setManagers(staffSimpleDtos); + } + if(evaluationGroup.getOutIds() != null && evaluationGroup.getOutIds().length() > 0){ + List ids = Arrays.stream(evaluationGroup.getOutIds().split(",")).map(new Function() { + @Override + public Long apply(String s) { + return Long.parseLong(s); + } + }).collect(Collectors.toList()); + + //指定人员，搜索人员信息 + List staffSimpleDtos = staffService.selectStaffSimpleInfoByIds(ids); + evaluationGroupDto.setOuts(staffSimpleDtos); + } + + BeanUtils.copyProperties(evaluationGroup, evaluationGroupDto); + return R.ok().put("data",evaluationGroupDto); + } + + + @PostMapping("/getGroups") @ApiOperation("获取考核组列表") @ApiResponses({@ApiResponse(code=200,message = "成功", response=EvaluationGroup.class)}) - public R getById(@RequestBody @ApiParam EvaluationGroupReq req) { + public R getGroups(@RequestBody @ApiParam EvaluationGroupReq req) { PageUtils pageUtils = evaluationGroupService.selectEvaluationGroupByReq(req); return R.ok().put("data",pageUtils); } diff --git a/src/main/resources/mapper/flow/StaffRoleDepartmentMapper.xml b/src/main/resources/mapper/flow/StaffRoleDepartmentMapper.xml index 413ecdc9..3ea7514c 100644 --- a/src/main/resources/mapper/flow/StaffRoleDepartmentMapper.xml +++ b/src/main/resources/mapper/flow/StaffRoleDepartmentMapper.xml @@ -111,5 +111,14 @@ + + From a63101d2c9592772f9a0131cded6b46155dfc794 Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 20 Oct 2020 12:07:17 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=91=98=E5=B7=A5=E5=92=8C=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E6=8E=A5=E5=8F=A3=E8=AF=B4=E6=98=8E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/DepartmentsController.java | 14 +++++--- .../app/controller/StaffController.java | 33 +++++++++++++++++++ .../lz/modules/app/dto/DepartmentsDto.java | 11 +++++++ .../java/com/lz/modules/app/dto/StaffDto.java | 11 ++++++- .../java/com/lz/modules/app/req/StaffReq.java | 32 ++++++++++++++++++ 5 files changed, 95 insertions(+), 6 deletions(-) create mode 100644 src/main/java/com/lz/modules/app/req/StaffReq.java diff --git a/src/main/java/com/lz/modules/app/controller/DepartmentsController.java b/src/main/java/com/lz/modules/app/controller/DepartmentsController.java index af4178a8..3036982f 100644 --- a/src/main/java/com/lz/modules/app/controller/DepartmentsController.java +++ b/src/main/java/com/lz/modules/app/controller/DepartmentsController.java @@ -4,12 +4,13 @@ import java.util.Arrays; import java.util.List; import com.lz.modules.app.dto.DepartmentsDto; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiResponse; +import io.swagger.annotations.ApiResponses; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import com.lz.modules.app.entity.DepartmentsEntity; import com.lz.modules.app.service.DepartmentsService; @@ -25,6 +26,7 @@ import com.lz.common.utils.R; */ @RestController @RequestMapping("staff/structure") +@Api(tags = "部门相关") public class DepartmentsController { @Autowired private DepartmentsService departmentsService; @@ -32,8 +34,10 @@ public class DepartmentsController { /** * 列表 */ - @RequestMapping("/list") + @PostMapping("/list") // @RequiresPermissions("staff:structure:list") + @ApiOperation("获取全部有效部门树列表") + @ApiResponses({@ApiResponse(code = 200, message = "成功", response = DepartmentsDto.class)}) public List list() { List departmentList = departmentsService.getDepartmentTree(); diff --git a/src/main/java/com/lz/modules/app/controller/StaffController.java b/src/main/java/com/lz/modules/app/controller/StaffController.java index 91a3b4c9..fdc043e9 100644 --- a/src/main/java/com/lz/modules/app/controller/StaffController.java +++ b/src/main/java/com/lz/modules/app/controller/StaffController.java @@ -1,5 +1,6 @@ package com.lz.modules.app.controller; +import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.google.common.collect.Lists; @@ -9,8 +10,11 @@ import com.lz.modules.app.dto.*; import com.lz.modules.app.entity.DepartmentsEntity; import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.app.enums.ExcelStaffHeardEnum; +import com.lz.modules.app.req.StaffReq; import com.lz.modules.app.service.*; +import io.swagger.annotations.*; import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -30,6 +34,7 @@ import java.util.*; */ @RestController @RequestMapping("staff/info") +@Api(tags = "人员相关") public class StaffController { @Autowired @@ -96,6 +101,34 @@ public class StaffController { return ret; } + /** + * 列表 + */ + @PostMapping("/stafflist") +// @RequiresPermissions("staff:info:list") + @ApiOperation("获取人员列表") + @ApiResponses({@ApiResponse(code = 200, message = "成功", response = StaffDto.class)}) + public R stafflist(@RequestBody @ApiParam StaffReq staffReq) { + //当前页 + Map map = new HashMap<>(); + if(staffReq.getCurrPage() > 0){ + map.put("page", staffReq.getCurrPage()); + } + + if(staffReq.getPageSize() > 0){ + map.put("limit", staffReq.getPageSize()); + } + + if(staffReq.getDepartmentId() != null){ + map.put("departmentId", staffReq.getDepartmentId()); + } + + if(staffReq.getName() != null && staffReq.getName().length() > 0){ + map.put("name", staffReq.getName()); + } + return list(map); + } + /** * 信息 diff --git a/src/main/java/com/lz/modules/app/dto/DepartmentsDto.java b/src/main/java/com/lz/modules/app/dto/DepartmentsDto.java index ec411f60..9a9df395 100644 --- a/src/main/java/com/lz/modules/app/dto/DepartmentsDto.java +++ b/src/main/java/com/lz/modules/app/dto/DepartmentsDto.java @@ -1,6 +1,8 @@ package com.lz.modules.app.dto; import com.baomidou.mybatisplus.annotation.TableField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -15,32 +17,41 @@ import java.util.List; * @date 2020-04-30 16:59:50 */ @Data +@ApiModel("部门信息Dto") public class DepartmentsDto implements Serializable{ private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "部门id", name = "id") + private Integer id; /** * 飞书部门id */ + @ApiModelProperty(value = "钉钉，飞书部门id", name = "departmentId") private String departmentId; /** * 飞书上级部门id */ + @ApiModelProperty(value = "钉钉，飞书上级部门id", name = "departmentParentId") private String departmentParentId; /** * 飞书显示部门人数 */ + @ApiModelProperty(value = "部门人员数量", name = "memberCount") private Integer memberCount; /** * 组织架构名称/部门名称 */ + @ApiModelProperty(value = "部门名称", name = "departmentName") private String departmentName; /** * ztree属性 */ @TableField(exist = false) + @ApiModelProperty(value = "部门id", name = "id") private Boolean open; @TableField(exist = false) + @ApiModelProperty(value = "部门id", name = "id") private List list; } diff --git a/src/main/java/com/lz/modules/app/dto/StaffDto.java b/src/main/java/com/lz/modules/app/dto/StaffDto.java index 605f2ff9..8bd87b5f 100644 --- a/src/main/java/com/lz/modules/app/dto/StaffDto.java +++ b/src/main/java/com/lz/modules/app/dto/StaffDto.java @@ -1,5 +1,7 @@ package com.lz.modules.app.dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -12,33 +14,40 @@ import java.io.Serializable; * @date 2020-04-29 20:59:20 */ @Data +@ApiModel("员工Dto") public class StaffDto implements Serializable { private static final long serialVersionUID = 1L; /** * 员工Id */ + @ApiModelProperty(name = "staffId", value = "员工id") private Long staffId; /** * 员工工号 */ + @ApiModelProperty(name = "staffNo", value = "工号") private String staffNo; /** * 员工姓名 */ - private String name; + @ApiModelProperty(name = "value", value = "姓名") + private String value; /** * 职位 */ + @ApiModelProperty(name = "position", value = "职位") private String position; /** * 人员状态【1：离职；0：在职】 */ + @ApiModelProperty(name = "staffStatus", value = "在职状态") private String staffStatus; /** * 是否是部门负责人 */ + @ApiModelProperty(name = "departmentLeader", value = "是否部门领导") private Integer departmentLeader; } diff --git a/src/main/java/com/lz/modules/app/req/StaffReq.java b/src/main/java/com/lz/modules/app/req/StaffReq.java new file mode 100644 index 00000000..c40941e4 --- /dev/null +++ b/src/main/java/com/lz/modules/app/req/StaffReq.java @@ -0,0 +1,32 @@ +package com.lz.modules.app.req; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 员工基本信息表 + * + * @author fumeiai + * @email fumeiai@linzikg.com + * @date 2020-04-29 20:59:20 + */ +@Data +@ApiModel("人员查询req") +public class StaffReq implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(name = "currPage", value = "当前页码") + private int currPage = 1; + @ApiModelProperty(name = "pageSize", value = "每页返回条数") + private int pageSize = 10; + // + @ApiModelProperty(name = "name", value = "员工姓名") + private String name; + @ApiModelProperty(name = "departmentId", value = "部门id") + private Integer departmentId; + +} From 62bacf2ddab2cab86a615d3c2e3589cca9dde5c5 Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 20 Oct 2020 12:13:29 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/lz/modules/app/dto/StaffDto.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/app/dto/StaffDto.java b/src/main/java/com/lz/modules/app/dto/StaffDto.java index 8bd87b5f..eb70bc37 100644 --- a/src/main/java/com/lz/modules/app/dto/StaffDto.java +++ b/src/main/java/com/lz/modules/app/dto/StaffDto.java @@ -33,7 +33,7 @@ public class StaffDto implements Serializable { * 员工姓名 */ @ApiModelProperty(name = "value", value = "姓名") - private String value; + private String name; /** * 职位 */ From 8b51e6edfbc2bed52ae90bb3d186ff7bc0df5242 Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 20 Oct 2020 15:48:42 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=93=9F=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/controller/DepartmentsController.java | 20 ++++++++----- .../controller/ReportResultController.java | 2 +- .../java/com/lz/modules/app/dao/StaffDao.java | 2 ++ .../lz/modules/app/dto/DepartmentsDto.java | 7 +++-- .../app/service/DepartmentsService.java | 2 +- .../lz/modules/app/service/StaffService.java | 2 ++ .../service/impl/DepartmentsServiceImpl.java | 29 +++++++++++++++---- .../app/service/impl/StaffServiceImpl.java | 5 ++++ .../{impl => }/ResultCalculateService.java | 2 +- .../service/ResultCalculateServiceImpl.java | 1 - .../controller/ResultCalculateController.java | 8 +---- .../mapper/generator/DepartmentsDao.xml | 2 +- .../resources/mapper/generator/StaffDao.xml | 10 +++++++ 13 files changed, 65 insertions(+), 27 deletions(-) rename src/main/java/com/lz/modules/flow/service/{impl => }/ResultCalculateService.java (94%) diff --git a/src/main/java/com/lz/modules/app/controller/DepartmentsController.java b/src/main/java/com/lz/modules/app/controller/DepartmentsController.java index 3036982f..959ee241 100644 --- a/src/main/java/com/lz/modules/app/controller/DepartmentsController.java +++ b/src/main/java/com/lz/modules/app/controller/DepartmentsController.java @@ -4,10 +4,7 @@ import java.util.Arrays; import java.util.List; import com.lz.modules.app.dto.DepartmentsDto; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiResponse; -import io.swagger.annotations.ApiResponses; +import io.swagger.annotations.*; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -36,14 +33,23 @@ public class DepartmentsController { */ @PostMapping("/list") // @RequiresPermissions("staff:structure:list") - @ApiOperation("获取全部有效部门树列表") - @ApiResponses({@ApiResponse(code = 200, message = "成功", response = DepartmentsDto.class)}) public List list() { - List departmentList = departmentsService.getDepartmentTree(); + List departmentList = departmentsService.getDepartmentTree(0); return departmentList; } + @GetMapping("/deplist") + // @RequiresPermissions("staff:structure:list") + @ApiOperation("获取全部有效部门树列表") + @ApiResponses({@ApiResponse(code = 200, message = "成功", response = DepartmentsDto.class)}) + public List deplist(@RequestParam @ApiParam(value = "请求类型0 请求部门不包含人员列表，1同时返回人员列表") int type) { + List departmentList = departmentsService.getDepartmentTree(1); + + return departmentList; + } + + /** * 信息 diff --git a/src/main/java/com/lz/modules/app/controller/ReportResultController.java b/src/main/java/com/lz/modules/app/controller/ReportResultController.java index 8d126368..580e8a2e 100644 --- a/src/main/java/com/lz/modules/app/controller/ReportResultController.java +++ b/src/main/java/com/lz/modules/app/controller/ReportResultController.java @@ -104,7 +104,7 @@ public class ReportResultController extends AbstractController{ public R departmentTreeByStaffId(){ Long userId = getUserId(); if(chartService.hrOrBoss(userId)){ - List data = departmentsService.getDepartmentTree(); + List data = departmentsService.getDepartmentTree(0); return R.ok().put("data",data); } if(chartService.leader(getUserId())){ diff --git a/src/main/java/com/lz/modules/app/dao/StaffDao.java b/src/main/java/com/lz/modules/app/dao/StaffDao.java index 17deb7d5..cc938077 100644 --- a/src/main/java/com/lz/modules/app/dao/StaffDao.java +++ b/src/main/java/com/lz/modules/app/dao/StaffDao.java @@ -82,4 +82,6 @@ public interface StaffDao extends BaseMapper { List getPositionByStaffIds(@Param("req") ReportListReq req, @Param("staffIds") List staffIds, @Param("page") IPage page); List selectStaffSimpleInfoByIds(@Param("ids") List ids); + + List getDepatAllStaffInfos(@Param("departmentId") String departmentId); } diff --git a/src/main/java/com/lz/modules/app/dto/DepartmentsDto.java b/src/main/java/com/lz/modules/app/dto/DepartmentsDto.java index 9a9df395..1930dfe8 100644 --- a/src/main/java/com/lz/modules/app/dto/DepartmentsDto.java +++ b/src/main/java/com/lz/modules/app/dto/DepartmentsDto.java @@ -21,12 +21,11 @@ import java.util.List; public class DepartmentsDto implements Serializable{ private static final long serialVersionUID = 1L; - @ApiModelProperty(value = "部门id", name = "id") - private Integer id; + /** * 飞书部门id */ - @ApiModelProperty(value = "钉钉，飞书部门id", name = "departmentId") + @ApiModelProperty(value = "部门id，钉钉，飞书部门id", name = "departmentId") private String departmentId; /** * 飞书上级部门id @@ -53,5 +52,7 @@ public class DepartmentsDto implements Serializable{ @TableField(exist = false) @ApiModelProperty(value = "部门id", name = "id") private List list; + @ApiModelProperty(value = "部门人员集合", name = "staffDtos") + private List staffDtos; } diff --git a/src/main/java/com/lz/modules/app/service/DepartmentsService.java b/src/main/java/com/lz/modules/app/service/DepartmentsService.java index 84b29c0d..78ad64da 100644 --- a/src/main/java/com/lz/modules/app/service/DepartmentsService.java +++ b/src/main/java/com/lz/modules/app/service/DepartmentsService.java @@ -27,7 +27,7 @@ public interface DepartmentsService extends IService { - List getDepartmentTree(); + List getDepartmentTree(int type); List selectByParentDepartmentId(String deparentId); diff --git a/src/main/java/com/lz/modules/app/service/StaffService.java b/src/main/java/com/lz/modules/app/service/StaffService.java index 3cd8461d..b9c444fb 100644 --- a/src/main/java/com/lz/modules/app/service/StaffService.java +++ b/src/main/java/com/lz/modules/app/service/StaffService.java @@ -84,5 +84,7 @@ public interface StaffService extends IService { List selectAll(); List selectStaffSimpleInfoByIds(List ids); + + List getDepatAllStaffInfos(String departmentId); } diff --git a/src/main/java/com/lz/modules/app/service/impl/DepartmentsServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/DepartmentsServiceImpl.java index f56ec600..98ecaa03 100644 --- a/src/main/java/com/lz/modules/app/service/impl/DepartmentsServiceImpl.java +++ b/src/main/java/com/lz/modules/app/service/impl/DepartmentsServiceImpl.java @@ -13,14 +13,17 @@ import com.lz.modules.app.dao.StaffDao; import com.lz.modules.app.dto.DepartmentInfos; import com.lz.modules.app.dto.DepartmentsDto; import com.lz.modules.app.dto.StaffDepartmentDto; +import com.lz.modules.app.dto.StaffDto; import com.lz.modules.app.entity.DepartmentsEntity; import com.lz.modules.app.entity.DepartmentsStaffRelateEntity; import com.lz.modules.app.entity.StaffEntity; import com.lz.modules.app.service.DepartmentsService; +import com.lz.modules.app.service.StaffService; import com.lz.modules.job.model.responseBo.DepartmentInfosBo; import org.apache.commons.collections.CollectionUtils; import org.apache.ibatis.annotations.Param; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -37,6 +40,9 @@ public class DepartmentsServiceImpl extends ServiceImpl params) { IPage page = this.page( @@ -62,9 +68,17 @@ public class DepartmentsServiceImpl extends ServiceImpl getDepartmentTree() { + public List getDepartmentTree(int type) { List departmentsParentsList = departmentsDao.getDepartmentsByparentId("1"); - getDepartmentTreeList(departmentsParentsList); + if(type == 1){ + for (DepartmentsDto dto: departmentsParentsList + ) { + List staffDtos = staffService.getDepatAllStaffInfos(dto.getDepartmentId()); + dto.setStaffDtos(staffDtos); + } + } + + getDepartmentTreeList(departmentsParentsList, type); return departmentsParentsList; } @@ -98,12 +112,17 @@ public class DepartmentsServiceImpl extends ServiceImpl getDepartmentTreeList(List departmentList) { + private List getDepartmentTreeList(List departmentList, int type) { List DepartmentsList = Lists.newArrayList(); for (DepartmentsDto departmentsDto : departmentList) { List departmentsChirdList = departmentsDao.getDepartmentsByparentId(departmentsDto.getDepartmentId()); if (departmentsChirdList.size() > 0) { - departmentsDto.setList(getDepartmentTreeList(departmentsChirdList)); + departmentsDto.setList(getDepartmentTreeList(departmentsChirdList, type)); + } + if(type == 1){ + List staffDtos = staffService.getDepatAllStaffInfos(departmentsDto.getDepartmentId()); + departmentsDto.setStaffDtos(staffDtos); + } DepartmentsList.add(departmentsDto); } @@ -232,7 +251,7 @@ public class DepartmentsServiceImpl extends ServiceImpl getDepartmentTreeByStaffId(String staffId,boolean containSelf) { DepartmentsStaffRelateEntity departmentsStaffRelateEntity = departmentsStaffRelateDao.selectByStaffId(Long.valueOf(staffId)); List departmentsParentsList = departmentsDao.getDepartmentsByparentId(departmentsStaffRelateEntity.getDepartmentId()); - getDepartmentTreeList(departmentsParentsList); + getDepartmentTreeList(departmentsParentsList, 0); if(containSelf){ List result = new ArrayList<>(); DepartmentsDto departmentsDto = new DepartmentsDto(); diff --git a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java index 784f951a..e59bd75e 100644 --- a/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java +++ b/src/main/java/com/lz/modules/app/service/impl/StaffServiceImpl.java @@ -458,6 +458,11 @@ public class StaffServiceImpl extends ServiceImpl impleme return staffDao.selectStaffSimpleInfoByIds(ids); } + @Override + public List getDepatAllStaffInfos(String departmentId){ + return staffDao.getDepatAllStaffInfos(departmentId); + } + } diff --git a/src/main/java/com/lz/modules/flow/service/impl/ResultCalculateService.java b/src/main/java/com/lz/modules/flow/service/ResultCalculateService.java similarity index 94% rename from src/main/java/com/lz/modules/flow/service/impl/ResultCalculateService.java rename to src/main/java/com/lz/modules/flow/service/ResultCalculateService.java index aff641f9..e8d130d7 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/ResultCalculateService.java +++ b/src/main/java/com/lz/modules/flow/service/ResultCalculateService.java @@ -1,4 +1,4 @@ -package com.lz.modules.flow.service.impl; +package com.lz.modules.flow.service; import com.baomidou.mybatisplus.extension.service.IService; import com.lz.modules.flow.entity.ResultCalculate; diff --git a/src/main/java/com/lz/modules/flow/service/ResultCalculateServiceImpl.java b/src/main/java/com/lz/modules/flow/service/ResultCalculateServiceImpl.java index dd03181e..bc23fd3e 100644 --- a/src/main/java/com/lz/modules/flow/service/ResultCalculateServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/ResultCalculateServiceImpl.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.lz.modules.flow.dao.ResultCalculateMapper; import com.lz.modules.flow.entity.ResultCalculate; import com.lz.modules.flow.model.ResultCalculateDto; -import com.lz.modules.flow.service.impl.ResultCalculateService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/lz/modules/performance/controller/ResultCalculateController.java b/src/main/java/com/lz/modules/performance/controller/ResultCalculateController.java index 11e8d54d..e2a27702 100644 --- a/src/main/java/com/lz/modules/performance/controller/ResultCalculateController.java +++ b/src/main/java/com/lz/modules/performance/controller/ResultCalculateController.java @@ -1,14 +1,10 @@ package com.lz.modules.performance.controller; -import com.alibaba.fastjson.JSONObject; -import com.lz.common.utils.PageUtils; import com.lz.common.utils.R; -import com.lz.common.utils.StringUtil; -import com.lz.modules.flow.entity.FlowChart; import com.lz.modules.flow.entity.ResultCalculate; import com.lz.modules.flow.model.ResultCalculateDto; -import com.lz.modules.flow.service.impl.ResultCalculateService; +import com.lz.modules.flow.service.ResultCalculateService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; @@ -19,9 +15,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.HashMap; import java.util.List; -import java.util.Map; @RestController @RequestMapping("/resultCalculate") diff --git a/src/main/resources/mapper/generator/DepartmentsDao.xml b/src/main/resources/mapper/generator/DepartmentsDao.xml index 17e94aae..173a17d4 100644 --- a/src/main/resources/mapper/generator/DepartmentsDao.xml +++ b/src/main/resources/mapper/generator/DepartmentsDao.xml @@ -25,7 +25,7 @@ diff --git a/src/main/resources/mapper/generator/StaffDao.xml b/src/main/resources/mapper/generator/StaffDao.xml index 1f175480..23e1cdc3 100644 --- a/src/main/resources/mapper/generator/StaffDao.xml +++ b/src/main/resources/mapper/generator/StaffDao.xml @@ -469,4 +469,14 @@ ) and occupation.staff_status=0 + + From d881e9336bab430ffa0f738d4c5f18e5070cc29f Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 20 Oct 2020 15:57:26 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8F=AF=E4=BB=A5=E6=9F=A5=E8=AF=A2=E5=88=B0?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/generator/StaffDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mapper/generator/StaffDao.xml b/src/main/resources/mapper/generator/StaffDao.xml index 23e1cdc3..664c39c0 100644 --- a/src/main/resources/mapper/generator/StaffDao.xml +++ b/src/main/resources/mapper/generator/StaffDao.xml @@ -475,8 +475,8 @@ case occ.staff_status when 0 then '在职' else '离职' end staff_status from (select staff.id as staff_id, staff.name as name, relate.is_leader as department_leader from lz_departments_staff_relate relate join lz_staff staff on staff.id = relate.staff_id - where relate.department_id = #{departmentId}) jj - join lz_staff_occupation occ on jj.staff_id=occ.staff_id where occ.staff_status=0 + where relate.department_id = #{departmentId} and relate.is_delete=0 and staff.is_delete=0) jj + join lz_staff_occupation occ on jj.staff_id=occ.staff_id where occ.staff_status=0 and occ.is_delete=0 From 6764e848c2f1e9ab4ed9c8551ed21da4bc2fced9 Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 20 Oct 2020 16:00:55 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E9=97=A8type?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=B8=8D=E8=B5=B7=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lz/modules/app/controller/DepartmentsController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/lz/modules/app/controller/DepartmentsController.java b/src/main/java/com/lz/modules/app/controller/DepartmentsController.java index 959ee241..153521b8 100644 --- a/src/main/java/com/lz/modules/app/controller/DepartmentsController.java +++ b/src/main/java/com/lz/modules/app/controller/DepartmentsController.java @@ -44,7 +44,7 @@ public class DepartmentsController { @ApiOperation("获取全部有效部门树列表") @ApiResponses({@ApiResponse(code = 200, message = "成功", response = DepartmentsDto.class)}) public List deplist(@RequestParam @ApiParam(value = "请求类型0 请求部门不包含人员列表，1同时返回人员列表") int type) { - List departmentList = departmentsService.getDepartmentTree(1); + List departmentList = departmentsService.getDepartmentTree(type); return departmentList; } From cec8d658ce337a76ff36f8e387495021d6ad669f Mon Sep 17 00:00:00 2001 From: wulin Date: Tue, 20 Oct 2020 16:08:00 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lz/modules/app/controller/DepartmentsController.java | 4 ++-- .../com/lz/modules/flow/dao/StaffRoleDepartmentMapper.java | 2 +- .../lz/modules/flow/service/StaffRoleDepartmentService.java | 2 +- .../flow/service/impl/StaffRoleDepartmentServiceImpl.java | 2 +- .../performance/controller/EvaluationGroupController.java | 6 +++--- .../resources/mapper/flow/StaffRoleDepartmentMapper.xml | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/lz/modules/app/controller/DepartmentsController.java b/src/main/java/com/lz/modules/app/controller/DepartmentsController.java index 153521b8..38cfe697 100644 --- a/src/main/java/com/lz/modules/app/controller/DepartmentsController.java +++ b/src/main/java/com/lz/modules/app/controller/DepartmentsController.java @@ -43,10 +43,10 @@ public class DepartmentsController { // @RequiresPermissions("staff:structure:list") @ApiOperation("获取全部有效部门树列表") @ApiResponses({@ApiResponse(code = 200, message = "成功", response = DepartmentsDto.class)}) - public List deplist(@RequestParam @ApiParam(value = "请求类型0 请求部门不包含人员列表，1同时返回人员列表") int type) { + public R deplist(@RequestParam @ApiParam(value = "请求类型0 请求部门不包含人员列表，1同时返回人员列表") int type) { List departmentList = departmentsService.getDepartmentTree(type); - return departmentList; + return R.ok().put("data", departmentList); } diff --git a/src/main/java/com/lz/modules/flow/dao/StaffRoleDepartmentMapper.java b/src/main/java/com/lz/modules/flow/dao/StaffRoleDepartmentMapper.java index 30158b1c..9467266c 100644 --- a/src/main/java/com/lz/modules/flow/dao/StaffRoleDepartmentMapper.java +++ b/src/main/java/com/lz/modules/flow/dao/StaffRoleDepartmentMapper.java @@ -44,5 +44,5 @@ public interface StaffRoleDepartmentMapper extends BaseMapper selectStaffRoleDepartmentByStaffRoleIdDepartments(@Param("staffRoleId") Long staffRoleId, @Param("departments") List departments); - List selectDepartmentSimpleInfos(@Param("ids") List ids); + List selectDepartmentSimpleInfos(@Param("ids") List ids); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/StaffRoleDepartmentService.java b/src/main/java/com/lz/modules/flow/service/StaffRoleDepartmentService.java index 408e17ad..07e7f51a 100644 --- a/src/main/java/com/lz/modules/flow/service/StaffRoleDepartmentService.java +++ b/src/main/java/com/lz/modules/flow/service/StaffRoleDepartmentService.java @@ -41,5 +41,5 @@ public interface StaffRoleDepartmentService extends IService selectDepartmentSimpleInfos(List ids); + List selectDepartmentSimpleInfos(List ids); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleDepartmentServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleDepartmentServiceImpl.java index 73ed66bd..1925104e 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/StaffRoleDepartmentServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/StaffRoleDepartmentServiceImpl.java @@ -82,7 +82,7 @@ public class StaffRoleDepartmentServiceImpl extends ServiceImpl selectDepartmentSimpleInfos(List ids){ + public List selectDepartmentSimpleInfos(List ids){ return staffRoleDepartmentMapper.selectDepartmentSimpleInfos(ids); } diff --git a/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java b/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java index 0f3f24e8..181f6965 100644 --- a/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java +++ b/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java @@ -60,10 +60,10 @@ public class EvaluationGroupController { EvaluationGroupDto evaluationGroupDto = new EvaluationGroupDto(); if(evaluationGroup.getDepIds() != null && evaluationGroup.getDepIds().length() > 0){ - List ids = Arrays.stream(evaluationGroup.getDepIds().split(",")).map(new Function() { + List ids = Arrays.stream(evaluationGroup.getDepIds().split(",")).map(new Function() { @Override - public Long apply(String s) { - return Long.parseLong(s); + public String apply(String s) { + return s; } }).collect(Collectors.toList()); List departmentsSimpleDtos = staffRoleDepartmentService.selectDepartmentSimpleInfos(ids); diff --git a/src/main/resources/mapper/flow/StaffRoleDepartmentMapper.xml b/src/main/resources/mapper/flow/StaffRoleDepartmentMapper.xml index 3ea7514c..88d725d8 100644 --- a/src/main/resources/mapper/flow/StaffRoleDepartmentMapper.xml +++ b/src/main/resources/mapper/flow/StaffRoleDepartmentMapper.xml @@ -114,7 +114,7 @@