From d2094cf630428f301024c2b4137ae63ec8b5e95a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E5=BB=BA=E8=B6=85?= <3182967682@qq.com> Date: Mon, 2 Nov 2020 10:06:27 +0800 Subject: [PATCH] fix --- .../flow/service/EvaluationGroupService.java | 3 +- .../impl/EvaluationGroupServiceImpl.java | 6 +++- .../controller/EvaluationGroupController.java | 11 +++--- .../performance/req/CheckStaffReq.java | 35 +++++++++++++++++++ 4 files changed, 46 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/lz/modules/performance/req/CheckStaffReq.java diff --git a/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java b/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java index 7990a5fc..2d6db490 100644 --- a/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java +++ b/src/main/java/com/lz/modules/flow/service/EvaluationGroupService.java @@ -7,6 +7,7 @@ import com.lz.modules.app.entity.StaffSimpleInfo; import com.lz.modules.flow.entity.EvaluationGroup; import com.lz.modules.flow.req.EvaluationGroupReq; import com.lz.modules.performance.dto.CheckStaffDto; +import com.lz.modules.performance.req.CheckStaffReq; import java.util.List; @@ -52,5 +53,5 @@ public interface EvaluationGroupService extends IService { void deleteByCopyIds(List ids); - R checkStaff(EvaluationGroup evaluationGroup); + R checkStaff(CheckStaffReq checkStaffReq); } \ No newline at end of file diff --git a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java index 6c7fc35b..36ededf1 100644 --- a/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java +++ b/src/main/java/com/lz/modules/flow/service/impl/EvaluationGroupServiceImpl.java @@ -22,8 +22,10 @@ import com.lz.modules.flow.req.EvaluationGroupReq; import com.lz.modules.flow.service.EvaluationGroupService; import com.lz.modules.flow.service.FlowStartService; import com.lz.modules.performance.dto.CheckStaffDto; +import com.lz.modules.performance.req.CheckStaffReq; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -272,7 +274,9 @@ public class EvaluationGroupServiceImpl extends ServiceImpl staffIdsByGroup = getStaffIdsByGroup(evaluationGroup); //其他组全部成员 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 0722d5de..9bad290b 100644 --- a/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java +++ b/src/main/java/com/lz/modules/performance/controller/EvaluationGroupController.java @@ -15,6 +15,7 @@ import com.lz.modules.flow.entity.StaffRole; import com.lz.modules.flow.model.EvaluationGroupDto; import com.lz.modules.flow.req.EvaluationGroupReq; import com.lz.modules.flow.service.*; +import com.lz.modules.performance.req.CheckStaffReq; import io.swagger.annotations.*; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -190,13 +191,9 @@ public class EvaluationGroupController { } - @GetMapping("/checkStaff") + @PostMapping("/checkStaff") @ApiOperation("校验是否有跨组人员") - public R checkStaff(@RequestParam @RequestBody @ApiParam EvaluationGroup evaluationGroup) { - - evaluationGroupService.checkStaff(evaluationGroup); - - return R.ok(); - + public R checkStaff(@RequestBody @ApiParam(required = true,name = "body") CheckStaffReq checkStaffReq) { + return evaluationGroupService.checkStaff(checkStaffReq); } } diff --git a/src/main/java/com/lz/modules/performance/req/CheckStaffReq.java b/src/main/java/com/lz/modules/performance/req/CheckStaffReq.java new file mode 100644 index 00000000..cb078ead --- /dev/null +++ b/src/main/java/com/lz/modules/performance/req/CheckStaffReq.java @@ -0,0 +1,35 @@ +package com.lz.modules.performance.req; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @Author: djc + * @Desc: + * @Date: 2020/11/2 9:55 + */ +@ApiModel("校验人员是否存在其他组") +@Data +public class CheckStaffReq { + // + @ApiModelProperty(value = "如果不传，那么表示新建，否则更新", name = "id") + private Long id; + //参与部门id，逗号隔开 + @ApiModelProperty(value = "参与部门id，逗号隔开", name = "depIds") + private String depIds; + //参与考核员工staff_id，逗号隔开 + @ApiModelProperty(value = "参与考核员工staff_id，逗号隔开", name = "staffIds") + private String staffIds; + //排除人员ids，逗号隔开 + @ApiModelProperty(value = "排除人员ids，逗号隔开", name = "outIds") + private String outIds; + + @ApiModelProperty(value = "是否确认变更组 0 :首次否 1：确认", name = "confirm") + private int confirm; +}